diff --git a/examples/connext_dds/remote_procedure_call/c++11/CMakeLists.txt b/examples/connext_dds/remote_procedure_call/c++11/CMakeLists.txt
index 911e14ae1..8eda63839 100644
--- a/examples/connext_dds/remote_procedure_call/c++11/CMakeLists.txt
+++ b/examples/connext_dds/remote_procedure_call/c++11/CMakeLists.txt
@@ -30,7 +30,7 @@ include(ConnextDdsAddExample)
 connextdds_add_example(
     IDL "Inventory"
     LANG "C++11"
-    # SUB_NAME "service"
-    # PUB_NAME "client"
+    SUB_NAME "service"
+    PUB_NAME "client"
     DEPENDENCIES RTIConnextDDS::messaging_cpp2_api
 )
\ No newline at end of file
diff --git a/examples/connext_dds/remote_procedure_call/c++11/Inventory_publisher.cxx b/examples/connext_dds/remote_procedure_call/c++11/Inventory_client.cxx
similarity index 100%
rename from examples/connext_dds/remote_procedure_call/c++11/Inventory_publisher.cxx
rename to examples/connext_dds/remote_procedure_call/c++11/Inventory_client.cxx
diff --git a/examples/connext_dds/remote_procedure_call/c++11/Inventory_subscriber.cxx b/examples/connext_dds/remote_procedure_call/c++11/Inventory_service.cxx
similarity index 100%
rename from examples/connext_dds/remote_procedure_call/c++11/Inventory_subscriber.cxx
rename to examples/connext_dds/remote_procedure_call/c++11/Inventory_service.cxx