diff --git a/examples/protocols/ibm-mqtt/sdkconfig.defaults b/examples/protocols/ibm-mqtt/sdkconfig.defaults
deleted file mode 100644
index 93ec30db..00000000
--- a/examples/protocols/ibm-mqtt/sdkconfig.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Example Configuration
-#
-CONFIG_MQTT_PUBLISH_INTERVAL=0
-
-#
-# ECLIPSE-MQTT
-#
-CONFIG_MQTT_USING_IBM=y
-CONFIG_MQTT_KEEP_ALIVE=30
-CONFIG_CLEAN_SESSION=y
-CONFIG_KEEP_SESSION=
-CONFIG_DEFAULT_MQTT_CLEAN_SESSION=1
-CONFIG_NO_TLS=y
-CONFIG_DEFAULT_MQTT_SECURITY=0
-CONFIG_MQTT_SEND_BUFFER=2048
-CONFIG_MQTT_RECV_BUFFER=2048
-CONFIG_MQTT_SEND_CYCLE=30000
-CONFIG_MQTT_RECV_CYCLE=0
-
diff --git a/examples/protocols/esp-mqtt/ssl/CMakeLists.txt b/examples/protocols/mqtt/ssl/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/CMakeLists.txt
rename to examples/protocols/mqtt/ssl/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ssl/Makefile b/examples/protocols/mqtt/ssl/Makefile
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/Makefile
rename to examples/protocols/mqtt/ssl/Makefile
diff --git a/examples/protocols/esp-mqtt/ssl/README.md b/examples/protocols/mqtt/ssl/README.md
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/README.md
rename to examples/protocols/mqtt/ssl/README.md
diff --git a/examples/protocols/esp-mqtt/ssl/main/CMakeLists.txt b/examples/protocols/mqtt/ssl/main/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/main/CMakeLists.txt
rename to examples/protocols/mqtt/ssl/main/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ssl/main/Kconfig.projbuild b/examples/protocols/mqtt/ssl/main/Kconfig.projbuild
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/main/Kconfig.projbuild
rename to examples/protocols/mqtt/ssl/main/Kconfig.projbuild
diff --git a/examples/protocols/esp-mqtt/ssl/main/app_main.c b/examples/protocols/mqtt/ssl/main/app_main.c
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/main/app_main.c
rename to examples/protocols/mqtt/ssl/main/app_main.c
diff --git a/examples/protocols/esp-mqtt/ssl/main/component.mk b/examples/protocols/mqtt/ssl/main/component.mk
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/main/component.mk
rename to examples/protocols/mqtt/ssl/main/component.mk
diff --git a/examples/protocols/esp-mqtt/ssl/main/iot_eclipse_org.pem b/examples/protocols/mqtt/ssl/main/iot_eclipse_org.pem
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/main/iot_eclipse_org.pem
rename to examples/protocols/mqtt/ssl/main/iot_eclipse_org.pem
diff --git a/examples/protocols/esp-mqtt/ssl/mqtt_ssl_example_test.py b/examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/mqtt_ssl_example_test.py
rename to examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
diff --git a/examples/protocols/esp-mqtt/ssl/sdkconfig.ci b/examples/protocols/mqtt/ssl/sdkconfig.ci
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl/sdkconfig.ci
rename to examples/protocols/mqtt/ssl/sdkconfig.ci
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/CMakeLists.txt b/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/CMakeLists.txt
rename to examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/Makefile b/examples/protocols/mqtt/ssl_mutual_auth/Makefile
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/Makefile
rename to examples/protocols/mqtt/ssl_mutual_auth/Makefile
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/README.md b/examples/protocols/mqtt/ssl_mutual_auth/README.md
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/README.md
rename to examples/protocols/mqtt/ssl_mutual_auth/README.md
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/CMakeLists.txt b/examples/protocols/mqtt/ssl_mutual_auth/main/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/CMakeLists.txt
rename to examples/protocols/mqtt/ssl_mutual_auth/main/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/Kconfig.projbuild b/examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/Kconfig.projbuild
rename to examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/app_main.c b/examples/protocols/mqtt/ssl_mutual_auth/main/app_main.c
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/app_main.c
rename to examples/protocols/mqtt/ssl_mutual_auth/main/app_main.c
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/client.crt b/examples/protocols/mqtt/ssl_mutual_auth/main/client.crt
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/client.crt
rename to examples/protocols/mqtt/ssl_mutual_auth/main/client.crt
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/client.key b/examples/protocols/mqtt/ssl_mutual_auth/main/client.key
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/client.key
rename to examples/protocols/mqtt/ssl_mutual_auth/main/client.key
diff --git a/examples/protocols/esp-mqtt/ssl_mutual_auth/main/component.mk b/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
similarity index 100%
rename from examples/protocols/esp-mqtt/ssl_mutual_auth/main/component.mk
rename to examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
diff --git a/examples/protocols/esp-mqtt/tcp/CMakeLists.txt b/examples/protocols/mqtt/tcp/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/CMakeLists.txt
rename to examples/protocols/mqtt/tcp/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/tcp/Makefile b/examples/protocols/mqtt/tcp/Makefile
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/Makefile
rename to examples/protocols/mqtt/tcp/Makefile
diff --git a/examples/protocols/esp-mqtt/tcp/README.md b/examples/protocols/mqtt/tcp/README.md
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/README.md
rename to examples/protocols/mqtt/tcp/README.md
diff --git a/examples/protocols/esp-mqtt/tcp/main/CMakeLists.txt b/examples/protocols/mqtt/tcp/main/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/main/CMakeLists.txt
rename to examples/protocols/mqtt/tcp/main/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/tcp/main/Kconfig.projbuild b/examples/protocols/mqtt/tcp/main/Kconfig.projbuild
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/main/Kconfig.projbuild
rename to examples/protocols/mqtt/tcp/main/Kconfig.projbuild
diff --git a/examples/protocols/esp-mqtt/tcp/main/app_main.c b/examples/protocols/mqtt/tcp/main/app_main.c
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/main/app_main.c
rename to examples/protocols/mqtt/tcp/main/app_main.c
diff --git a/examples/protocols/esp-mqtt/tcp/main/component.mk b/examples/protocols/mqtt/tcp/main/component.mk
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/main/component.mk
rename to examples/protocols/mqtt/tcp/main/component.mk
diff --git a/examples/protocols/esp-mqtt/tcp/mqtt_tcp_example_test.py b/examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/mqtt_tcp_example_test.py
rename to examples/protocols/mqtt/tcp/mqtt_tcp_example_test.py
diff --git a/examples/protocols/esp-mqtt/tcp/sdkconfig.ci b/examples/protocols/mqtt/tcp/sdkconfig.ci
similarity index 100%
rename from examples/protocols/esp-mqtt/tcp/sdkconfig.ci
rename to examples/protocols/mqtt/tcp/sdkconfig.ci
diff --git a/examples/protocols/esp-mqtt/ws/CMakeLists.txt b/examples/protocols/mqtt/ws/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/CMakeLists.txt
rename to examples/protocols/mqtt/ws/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ws/Makefile b/examples/protocols/mqtt/ws/Makefile
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/Makefile
rename to examples/protocols/mqtt/ws/Makefile
diff --git a/examples/protocols/esp-mqtt/ws/README.md b/examples/protocols/mqtt/ws/README.md
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/README.md
rename to examples/protocols/mqtt/ws/README.md
diff --git a/examples/protocols/esp-mqtt/ws/main/CMakeLists.txt b/examples/protocols/mqtt/ws/main/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/main/CMakeLists.txt
rename to examples/protocols/mqtt/ws/main/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/ws/main/Kconfig.projbuild b/examples/protocols/mqtt/ws/main/Kconfig.projbuild
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/main/Kconfig.projbuild
rename to examples/protocols/mqtt/ws/main/Kconfig.projbuild
diff --git a/examples/protocols/esp-mqtt/ws/main/app_main.c b/examples/protocols/mqtt/ws/main/app_main.c
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/main/app_main.c
rename to examples/protocols/mqtt/ws/main/app_main.c
diff --git a/examples/protocols/esp-mqtt/ws/main/component.mk b/examples/protocols/mqtt/ws/main/component.mk
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/main/component.mk
rename to examples/protocols/mqtt/ws/main/component.mk
diff --git a/examples/protocols/esp-mqtt/ws/mqtt_ws_example_test.py b/examples/protocols/mqtt/ws/mqtt_ws_example_test.py
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/mqtt_ws_example_test.py
rename to examples/protocols/mqtt/ws/mqtt_ws_example_test.py
diff --git a/examples/protocols/esp-mqtt/ws/sdkconfig.ci b/examples/protocols/mqtt/ws/sdkconfig.ci
similarity index 100%
rename from examples/protocols/esp-mqtt/ws/sdkconfig.ci
rename to examples/protocols/mqtt/ws/sdkconfig.ci
diff --git a/examples/protocols/esp-mqtt/wss/CMakeLists.txt b/examples/protocols/mqtt/wss/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/CMakeLists.txt
rename to examples/protocols/mqtt/wss/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/wss/Makefile b/examples/protocols/mqtt/wss/Makefile
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/Makefile
rename to examples/protocols/mqtt/wss/Makefile
diff --git a/examples/protocols/esp-mqtt/wss/README.md b/examples/protocols/mqtt/wss/README.md
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/README.md
rename to examples/protocols/mqtt/wss/README.md
diff --git a/examples/protocols/esp-mqtt/wss/main/CMakeLists.txt b/examples/protocols/mqtt/wss/main/CMakeLists.txt
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/main/CMakeLists.txt
rename to examples/protocols/mqtt/wss/main/CMakeLists.txt
diff --git a/examples/protocols/esp-mqtt/wss/main/Kconfig.projbuild b/examples/protocols/mqtt/wss/main/Kconfig.projbuild
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/main/Kconfig.projbuild
rename to examples/protocols/mqtt/wss/main/Kconfig.projbuild
diff --git a/examples/protocols/esp-mqtt/wss/main/app_main.c b/examples/protocols/mqtt/wss/main/app_main.c
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/main/app_main.c
rename to examples/protocols/mqtt/wss/main/app_main.c
diff --git a/examples/protocols/esp-mqtt/wss/main/component.mk b/examples/protocols/mqtt/wss/main/component.mk
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/main/component.mk
rename to examples/protocols/mqtt/wss/main/component.mk
diff --git a/examples/protocols/esp-mqtt/wss/main/iot_eclipse_org.pem b/examples/protocols/mqtt/wss/main/iot_eclipse_org.pem
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/main/iot_eclipse_org.pem
rename to examples/protocols/mqtt/wss/main/iot_eclipse_org.pem
diff --git a/examples/protocols/esp-mqtt/wss/mqtt_wss_example_test.py b/examples/protocols/mqtt/wss/mqtt_wss_example_test.py
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/mqtt_wss_example_test.py
rename to examples/protocols/mqtt/wss/mqtt_wss_example_test.py
diff --git a/examples/protocols/esp-mqtt/wss/sdkconfig.ci b/examples/protocols/mqtt/wss/sdkconfig.ci
similarity index 100%
rename from examples/protocols/esp-mqtt/wss/sdkconfig.ci
rename to examples/protocols/mqtt/wss/sdkconfig.ci