diff --git a/sdk/samples/iot/CMakeLists.txt b/sdk/samples/iot/CMakeLists.txt
index 38e0a48138f..364bbccaa81 100644
--- a/sdk/samples/iot/CMakeLists.txt
+++ b/sdk/samples/iot/CMakeLists.txt
@@ -82,22 +82,22 @@ target_link_libraries(paho_iot_hub_pnp_sample
 )
 
 # PnP Component Sample
-add_executable (paho_iot_hub_pnp_component_example
+add_executable (paho_iot_hub_pnp_component_sample
   ${CMAKE_CURRENT_LIST_DIR}/sample_pnp_component_mqtt.c
   ${CMAKE_CURRENT_LIST_DIR}/sample_pnp_device_info_component.c
   ${CMAKE_CURRENT_LIST_DIR}/sample_pnp_thermostat_component.c
-  ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_pnp_component_example.c
+  ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_pnp_component_sample.c
   ${CMAKE_CURRENT_LIST_DIR}/sample_pnp.c
 )
 
 # SDK deps
-target_link_libraries(paho_iot_hub_pnp_component_example
+target_link_libraries(paho_iot_hub_pnp_component_sample
   PRIVATE
     az::iot::hub
 )
 
 # External deps
-target_link_libraries(paho_iot_hub_pnp_component_example
+target_link_libraries(paho_iot_hub_pnp_component_sample
   PRIVATE
     eclipse-paho-mqtt-c::paho-mqtt3cs-static
     OpenSSL::SSL
@@ -159,7 +159,7 @@ if (MSVC)
     set_target_properties(
         paho_iot_hub_c2d_sample
         paho_iot_hub_methods_sample
-        paho_iot_hub_pnp_component_example
+        paho_iot_hub_pnp_component_sample
         paho_iot_hub_pnp_sample
         paho_iot_hub_telemetry_sample
         paho_iot_hub_sas_telemetry_sample
diff --git a/sdk/samples/iot/README.md b/sdk/samples/iot/README.md
index c22fc0f2c6b..7e08a774341 100644
--- a/sdk/samples/iot/README.md
+++ b/sdk/samples/iot/README.md
@@ -98,9 +98,9 @@ This section provides an overview of the different samples available to run and
 
 ### IoT Hub Plug and Play Multiple Component
 
-- *Executable:* `paho_iot_hub_pnp_component_example`
+- *Executable:* `paho_iot_hub_pnp_component_sample`
 
-This [sample](https://github.com/Azure/azure-sdk-for-c/blob/master/sdk/samples/iot/paho_iot_hub_pnp_component_example.c) connects an IoT Plug and Play enabled device with the Digital Twin Model ID (DTMI) detailed [here](https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v2/samples/TemperatureController.json). X509 self-certification is used.
+This sample connects an IoT Plug and Play enabled device with the Digital Twin Model ID (DTMI) detailed [here](https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v2/samples/TemperatureController.json). X509 self-certification is used.
 
 This temperature controller is made up of the following sub-components
 
diff --git a/sdk/samples/iot/paho_iot_hub_pnp_component_example.c b/sdk/samples/iot/paho_iot_hub_pnp_component_sample.c
similarity index 100%
rename from sdk/samples/iot/paho_iot_hub_pnp_component_example.c
rename to sdk/samples/iot/paho_iot_hub_pnp_component_sample.c