diff --git a/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/include/common.h b/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/include/common.h
index 4562778fb5..c38f380ccf 100644
--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/include/common.h
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/include/common.h
@@ -31,6 +31,6 @@
 
 /* Defines */
 #define TAG "NimBLE_Connection"
-#define DEVICE_NAME "NimBLE_DEMO"
+#define DEVICE_NAME "NimBLE_CONN"
 
 #endif // COMMON_H
diff --git a/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md b/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md
index 5d6747da59..d4aaed0aff 100644
--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md
@@ -366,10 +366,10 @@ static void heart_rate_task(void *param) {
 
 If everything goes well, you should be able to see 4 services when connected to ESP32, including
 
-- GAP
-- GATT
-- Heart Rate Service
-- Automation IO Service
+- Generic Access
+- Generic Attribute
+- Heart Rate
+- Automation IO
 
 Click on Automation IO Service, you should be able to see LED characteristic. Click on upload button, you should be able to write `ON` or `OFF` value. Send it to the device, LED will be turned on or off following your instruction.
 
diff --git a/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/include/common.h b/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/include/common.h
index c6fdd3550a..d5a5eca978 100644
--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/include/common.h
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/include/common.h
@@ -32,6 +32,6 @@
 
 /* Defines */
 #define TAG "NimBLE_GATT_Server"
-#define DEVICE_NAME "NimBLE_DEMO"
+#define DEVICE_NAME "NimBLE_GATT"
 
 #endif // COMMON_H
diff --git a/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/include/common.h b/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/include/common.h
index 5713dd6f31..36ce8ad93d 100644
--- a/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/include/common.h
+++ b/examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/include/common.h
@@ -33,6 +33,6 @@
 
 /* Defines */
 #define TAG "NimBLE_Security"
-#define DEVICE_NAME "NimBLE_DEMO"
+#define DEVICE_NAME "NimBLE_SEC"
 
 #endif // COMMON_H