Thu Jun 17 08:33:14 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp:
          Renamed file (underscore between Shapes and Sender/Control/Receiver).

20 files changed, 700 insertions, 667 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a0546e10221..fca3d5982ac 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,36 @@
+Thu Jun 17 08:33:14 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp:
+          Renamed file (underscore between Shapes and Sender/Control/Receiver).
+
 Thu Jun 17 08:15:26 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
index 0fd5f699363..e5f06657a4f 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp
@@ -42,7 +42,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesReceiver_svnt</string>
+          <string>Shapes_Receiver_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -53,7 +53,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesReceiver_exec</string>
+          <string>Shapes_Receiver_exec</string>
         </value>
       </value>
     </execParameter>
@@ -94,7 +94,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesControl_svnt</string>
+          <string>Shapes_Control_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -105,7 +105,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesControl_exec</string>
+          <string>Shapes_Control_exec</string>
         </value>
       </value>
     </execParameter>
@@ -198,7 +198,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesSender_svnt</string>
+          <string>Shapes_Sender_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -209,7 +209,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ShapesSender_exec</string>
+          <string>Shapes_Sender_exec</string>
         </value>
       </value>
     </execParameter>
@@ -408,16 +408,16 @@
   </connection>
 
   <artifact xmi:id="Sender_ExecArtifact">
-    <name>ShapesSender_exec</name>
+    <name>Shapes_Sender_exec</name>
     <source/>
     <node/>
-    <location>ShapesSender_exec</location>
+    <location>Shapes_Sender_exec</location>
   </artifact>
   <artifact xmi:id="Sender_SvntArtifact">
-    <name>ShapesSender_svnt</name>
+    <name>Shapes_Sender_svnt</name>
     <source/>
     <node/>
-    <location>ShapesSender_svnt</location>
+    <location>Shapes_Sender_svnt</location>
   </artifact>
   <artifact xmi:id="Sender_StubArtifact">
     <name>Sender_stub</name>
@@ -438,16 +438,16 @@
     <location>Shapes_conn_svnt</location>
   </artifact>
   <artifact xmi:id="Receiver_ExecArtifact">
-    <name>ShapesReceiver_exec</name>
+    <name>Shapes_Receiver_exec</name>
     <source/>
     <node/>
-    <location>ShapesReceiver_exec</location>
+    <location>Shapes_Receiver_exec</location>
   </artifact>
   <artifact xmi:id="Receiver_SvntArtifact">
-    <name>ShapesReceiver_svnt</name>
+    <name>Shapes_Receiver_svnt</name>
     <source/>
     <node/>
-    <location>ShapesReceiver_svnt</location>
+    <location>Shapes_Receiver_svnt</location>
   </artifact>
   <artifact xmi:id="Receiver_StubArtifact">
     <name>Receiver_stub</name>
@@ -456,16 +456,16 @@
     <location>Receiver_stub</location>
   </artifact>
   <artifact xmi:id="Control_ExecArtifact">
-    <name>ShapesControl_exec</name>
+    <name>Shapes_Control_exec</name>
     <source/>
     <node/>
-    <location>ShapesControl_exec</location>
+    <location>Shapes_Control_exec</location>
   </artifact>
   <artifact xmi:id="Control_SvntArtifact">
-    <name>ShapesControl_svnt</name>
+    <name>Shapes_Control_svnt</name>
     <source/>
     <node/>
-    <location>ShapesControl_svnt</location>
+    <location>Shapes_Control_svnt</location>
   </artifact>
   <artifact xmi:id="Control_StubArtifact">
     <name>Control_stub</name>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc
deleted file mode 100644
index 7650b3769e2..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-project(ShapesControl_obj_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
-              -Wb,stub_export_include=ShapesControl_obj_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \
-              -Wb,skel_export_include=ShapesControl_obj_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \
-              -Wb,svnt_export_include=ShapesControl_obj_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \
-              -Wb,exec_export_include=ShapesControl_obj_exec_export.h \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    ShapesControl_obj.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesControl_obj_lem_gen) : ciaoidldefaults {
-  after += ShapesControl_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \
-              -Wb,stub_export_include=ShapesControl_obj_lem_stub_export.h \
-              -SS -Gxhst \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/ShapesControl_objE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesControl_obj_lem_stub) : ccm_svnt {
-  after += ShapesControl_obj_lem_gen ShapesControl_obj_stub
-
-  libs  += ShapesControl_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode
-
-  sharedname = ShapesControl_obj_lem_stub
-  dynamicflags   = SHAPES_CONTROL_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_objEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_objEC.h
-    GeneratedCode/ShapesControl_obj_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_objEC.inl
-  }
-}
-
-project(ShapesControl_obj_stub) : ccm_stub {
-  after += ShapesControl_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub
-
-  libs  += Shapes_defn_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode
-
-  sharedname = ShapesControl_obj_stub
-  dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_objC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_objC.h
-    GeneratedCode/ShapesControl_obj_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_objC.inl
-  }
-}
-
-
-project(ShapesControl_obj_svnt) : ciao_servant {
-  after      += ShapesControl_obj_lem_stub ShapesControl_obj_stub \
-                Shapes_defn_idl_gen Shapes_defn_stub
-
-  libs       += ShapesControl_obj_stub ShapesControl_obj_lem_stub \
-                Shapes_defn_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode
-
-  sharedname  = ShapesControl_obj_svnt
-  dynamicflags = SHAPES_CONTROL_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_objS.cpp
-    GeneratedCode/ShapesControl_obj_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_objS.h
-    GeneratedCode/ShapesControl_obj_svnt.h
-    GeneratedCode/ShapesControl_obj_svnt_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_objS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl
index 70666866e15..aa2f6e6e318 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl
@@ -5,7 +5,7 @@
 
 #include "Shapes_defn.idl"
 
-#pragma ciao lem "ShapesControl_objE.idl"
+#pragma ciao lem "Shapes_Control_objE.idl"
 
 module Shapes
 {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc
new file mode 100644
index 00000000000..8679c8d0e98
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc
@@ -0,0 +1,129 @@
+// $Id$
+
+project(Shapes_Control_obj_idl_gen) : componentidldefaults {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \
+              -Wb,stub_export_include=Shapes_Control_obj_stub_export.h \
+              -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \
+              -Wb,skel_export_include=Shapes_Control_obj_svnt_export.h \
+              -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \
+              -Wb,svnt_export_include=Shapes_Control_obj_svnt_export.h \
+              -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \
+              -Wb,exec_export_include=Shapes_Control_obj_exec_export.h \
+              -I../../ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    Shapes_Control_obj.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Control_obj_lem_gen) : ciaoidldefaults {
+  after += Shapes_Control_obj_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \
+              -Wb,stub_export_include=Shapes_Control_obj_lem_stub_export.h \
+              -SS -Gxhst \
+              -I../../ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    GeneratedCode/Shapes_Control_objE.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Control_obj_lem_stub) : ccm_svnt {
+  after += Shapes_Control_obj_lem_gen Shapes_Control_obj_stub
+
+  libs  += Shapes_Control_obj_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname = Shapes_Control_obj_lem_stub
+  dynamicflags   = SHAPES_CONTROL_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_objEC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_objEC.h
+    GeneratedCode/Shapes_Control_obj_lem_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_objEC.inl
+  }
+}
+
+project(Shapes_Control_obj_stub) : ccm_stub {
+  after += Shapes_Control_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub
+
+  libs  += Shapes_defn_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname = Shapes_Control_obj_stub
+  dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_objC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_objC.h
+    GeneratedCode/Shapes_Control_obj_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_objC.inl
+  }
+}
+
+
+project(Shapes_Control_obj_svnt) : ciao_servant {
+  after      += Shapes_Control_obj_lem_stub Shapes_Control_obj_stub \
+                Shapes_defn_idl_gen Shapes_defn_stub
+
+  libs       += Shapes_Control_obj_stub Shapes_Control_obj_lem_stub \
+                Shapes_defn_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname  = Shapes_Control_obj_svnt
+  dynamicflags = SHAPES_CONTROL_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_objS.cpp
+    GeneratedCode/Shapes_Control_obj_svnt.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_objS.h
+    GeneratedCode/Shapes_Control_obj_svnt.h
+    GeneratedCode/Shapes_Control_obj_svnt_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_objS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc
deleted file mode 100644
index 7b14d3d06ab..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id$
-
-project(ShapesControl_idl_gen) : componentidldefaults {
-  after += ShapesControl_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \
-              -Wb,stub_export_include=ShapesControl_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
-              -Wb,skel_export_include=ShapesControl_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
-              -Wb,svnt_export_include=ShapesControl_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
-              -Wb,exec_export_include=ShapesControl_exec_export.h \
-              -I../ports \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    ShapesControl_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesControl_lem_gen) : ciaoidldefaults {
-  after += ShapesControl_idl_gen ShapesControl_obj_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=ShapesControl_lem_stub_export.h \
-              -SS -Gxhst \
-              -I../ports \
-              -I../ports/GeneratedCode \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/ShapesControl_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesControl_lem_stub) : ccm_svnt {
-  after += ShapesControl_lem_gen ShapesControl_stub Shapes_msg_stub \
-           ShapesControl_obj_stub
-
-  libs  += Shapes_msg_stub ShapesControl_stub ShapesControl_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
-
-  sharedname = ShapesControl_lem_stub
-  dynamicflags   = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_compEC.h
-    GeneratedCode/ShapesControl_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_compEC.inl
-  }
-}
-
-project(ShapesControl_stub) : ccm_stub {
-  after += ShapesControl_idl_gen Shapes_msg_stub \
-           ShapesControl_obj_stub ShapesControl_obj_lem_stub
-
-  libs  += Shapes_msg_stub ShapesControl_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
-
-  sharedname = ShapesControl_stub
-  dynamicflags   = SHAPES_CONTROL_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_compC.h
-    GeneratedCode/ShapesControl_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_compC.inl
-  }
-}
-
-project(ShapesControl_exec) : ciao_executor {
-  after   += ShapesControl_lem_stub ShapesControl_stub \
-             ShapesControl_obj_lem_stub
-
-  libs += ShapesControl_stub ShapesControl_lem_stub Shapes_msg_stub \
-          ShapesControl_obj_lem_stub ShapesControl_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname = ShapesControl_exec
-  dynamicflags   = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ShapesControl_exec.cpp
-  }
-
-  Header_Files {
-    ShapesControl_exec.h
-    ShapesControl_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesControl_svnt) : ciao_servant {
-  after      += Shapes_msg_stub  ShapesControl_lem_stub \
-                ShapesControl_stub ShapesControl_obj_svnt \
-                ShapesControl_obj_lem_stub
-
-  libs       += ShapesControl_stub ShapesControl_lem_stub  \
-                Shapes_msg_stub \
-                ShapesControl_obj_stub ShapesControl_obj_svnt \
-                ShapesControl_obj_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname  = ShapesControl_svnt
-  dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesControl_compS.cpp
-    GeneratedCode/ShapesControl_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesControl_compS.h
-    GeneratedCode/ShapesControl_comp_svnt.h
-    GeneratedCode/ShapesControl_svnt_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesControl_compS.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl
index 0c37c9c8806..54d154923b6 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl
@@ -3,7 +3,7 @@
 #ifndef SHAPES_CONTROL_COMP_IDL_
 #define SHAPES_CONTROL_COMP_IDL_
 
-#include "ShapesControl_obj.idl"
+#include "Shapes_Control_obj.idl"
 
 #include <Components.idl>
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc
new file mode 100644
index 00000000000..cbbba62e7a1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc
@@ -0,0 +1,167 @@
+// $Id$
+
+project(Shapes_Control_idl_gen) : componentidldefaults {
+  after += Shapes_Control_obj_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \
+              -Wb,stub_export_include=Shapes_Control_stub_export.h \
+              -Wb,skel_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
+              -Wb,skel_export_include=Shapes_Control_svnt_export.h \
+              -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \
+              -Wb,svnt_export_include=Shapes_Control_svnt_export.h \
+              -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \
+              -Wb,exec_export_include=Shapes_Control_exec_export.h \
+              -I../ports \
+              -I../../ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    Shapes_Control_comp.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Control_lem_gen) : ciaoidldefaults {
+  after += Shapes_Control_idl_gen Shapes_Control_obj_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \
+              -Wb,stub_export_include=Shapes_Control_lem_stub_export.h \
+              -SS -Gxhst \
+              -I../ports \
+              -I../ports/GeneratedCode \
+              -I../../ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    GeneratedCode/Shapes_Control_compE.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Control_lem_stub) : ccm_svnt {
+  after += Shapes_Control_lem_gen Shapes_Control_stub Shapes_msg_stub \
+           Shapes_Control_obj_stub
+
+  libs  += Shapes_msg_stub Shapes_Control_stub Shapes_Control_obj_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
+
+  sharedname = Shapes_Control_lem_stub
+  dynamicflags   = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_compEC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_compEC.h
+    GeneratedCode/Shapes_Control_lem_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_compEC.inl
+  }
+}
+
+project(Shapes_Control_stub) : ccm_stub {
+  after += Shapes_Control_idl_gen Shapes_msg_stub \
+           Shapes_Control_obj_stub Shapes_Control_obj_lem_stub
+
+  libs  += Shapes_msg_stub Shapes_Control_obj_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../ports/GeneratedCode
+
+  sharedname = Shapes_Control_stub
+  dynamicflags   = SHAPES_CONTROL_COMP_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_compC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_compC.h
+    GeneratedCode/Shapes_Control_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_compC.inl
+  }
+}
+
+project(Shapes_Control_exec) : ciao_executor {
+  after   += Shapes_Control_lem_stub Shapes_Control_stub \
+             Shapes_Control_obj_lem_stub
+
+  libs += Shapes_Control_stub Shapes_Control_lem_stub Shapes_msg_stub \
+          Shapes_Control_obj_lem_stub Shapes_Control_obj_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname = Shapes_Control_exec
+  dynamicflags   = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Shapes_Control_exec.cpp
+  }
+
+  Header_Files {
+    Shapes_Control_exec.h
+    Shapes_Control_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(Shapes_Control_svnt) : ciao_servant {
+  after      += Shapes_msg_stub  Shapes_Control_lem_stub \
+                Shapes_Control_stub Shapes_Control_obj_svnt \
+                Shapes_Control_obj_lem_stub
+
+  libs       += Shapes_Control_stub Shapes_Control_lem_stub  \
+                Shapes_msg_stub \
+                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
+                Shapes_Control_obj_lem_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname  = Shapes_Control_svnt
+  dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Control_compS.cpp
+    GeneratedCode/Shapes_Control_comp_svnt.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Control_compS.h
+    GeneratedCode/Shapes_Control_comp_svnt.h
+    GeneratedCode/Shapes_Control_svnt_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Control_compS.inl
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp
index c58f5e37a20..ff18da3fa71 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ShapesControl_exec.h"
+#include "Shapes_Control_exec.h"
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h
index 2c1a8c96201..eb008f84593 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h
@@ -4,9 +4,9 @@
 #ifndef CIAO_CONTROL_EXEC_H_
 #define CIAO_CONTROL_EXEC_H_
 
-#include "ShapesControl_compEC.h"
+#include "Shapes_Control_compEC.h"
 
-#include /**/ "ShapesControl_exec_export.h"
+#include /**/ "Shapes_Control_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc
deleted file mode 100644
index 4d8f808cd11..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-// $Id$
-
-project(ShapesReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Shapes_conn_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \
-              -Wb,stub_export_include=ShapesReceiver_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
-              -Wb,skel_export_include=ShapesReceiver_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=ShapesReceiver_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
-              -Wb,exec_export_include=ShapesReceiver_exec_export.h \
-              -I../../ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    ShapesReceiver_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += ShapesReceiver_idl_gen ShapesSender_idl_lem_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=ShapesReceiver_lem_stub_export.h \
-              -SS -Gxhst \
-              -I../../ports \
-              -I../../ports/GeneratedCode \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/ShapesReceiver_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += ShapesReceiver_lem_gen ShapesReceiver_stub  Shapes_conn_stub \
-           Shapes_msg_stub
-
-  libs  += ShapesReceiver_stub Shapes_conn_stub Shapes_msg_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode
-
-  sharedname = ShapesReceiver_lem_stub
-  dynamicflags   = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesReceiver_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesReceiver_compEC.h
-    GeneratedCode/ShapesReceiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesReceiver_compEC.inl
-  }
-}
-
-project(ShapesReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += ShapesReceiver_idl_gen Shapes_conn_stub \
-           Shapes_msg_stub Shapes_conn_lem_gen
-
-  libs  += Shapes_conn_stub Shapes_msg_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode
-
-  sharedname = ShapesReceiver_stub
-  dynamicflags   = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesReceiver_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesReceiver_compC.h
-    GeneratedCode/ShapesReceiver_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesReceiver_compC.inl
-  }
-}
-
-project(ShapesReceiver_exec) : ciao_executor, dds4ccm_base {
-  after += ShapesReceiver_lem_stub ShapesReceiver_stub \
-           Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \
-           DDS4CCM_lem_stub
-
-  libs += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \
-          Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname = ShapesReceiver_exec
-  dynamicflags   = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ShapesReceiver_exec.cpp
-  }
-
-  Header_Files {
-    ShapesReceiver_exec.h
-    GeneratedCode/ShapesReceiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesReceiver_svnt) : ciao_servant, dds4ccm_base {
-  after      += ShapesReceiver_lem_stub Shapes_msg_stub \
-                Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \
-                Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-
-  libs       += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \
-                Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \
-                Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
-
-  sharedname  = ShapesReceiver_svnt
-  dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesReceiver_compS.cpp
-    GeneratedCode/ShapesReceiver_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesReceiver_compS.h
-    GeneratedCode/ShapesReceiver_comp_svnt.h
-    GeneratedCode/ShapesReceiver_svnt_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesReceiver_compS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl
index 7deea14c2ad..7deea14c2ad 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc
new file mode 100644
index 00000000000..19e234f77aa
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc
@@ -0,0 +1,166 @@
+// $Id$
+
+project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+  custom_only = 1
+  after += Shapes_conn_idl_gen
+  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \
+              -Wb,stub_export_include=Shapes_Receiver_stub_export.h \
+              -Wb,skel_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
+              -Wb,skel_export_include=Shapes_Receiver_svnt_export.h \
+              -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \
+              -Wb,svnt_export_include=Shapes_Receiver_svnt_export.h \
+              -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \
+              -Wb,exec_export_include=Shapes_Receiver_exec_export.h \
+              -I../../ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    Shapes_Receiver_comp.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+  after += Shapes_Receiver_idl_gen Shapes_Sender_idl_lem_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \
+              -Wb,stub_export_include=Shapes_Receiver_lem_stub_export.h \
+              -SS -Gxhst \
+              -I../../ports \
+              -I../../ports/GeneratedCode \
+              -o GeneratedCode
+
+  IDL_Files {
+    GeneratedCode/Shapes_Receiver_compE.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
+  after += Shapes_Receiver_lem_gen Shapes_Receiver_stub  Shapes_conn_stub \
+           Shapes_msg_stub
+
+  libs  += Shapes_Receiver_stub Shapes_conn_stub Shapes_msg_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname = Shapes_Receiver_lem_stub
+  dynamicflags   = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Receiver_compEC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Receiver_compEC.h
+    GeneratedCode/Shapes_Receiver_lem_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Receiver_compEC.inl
+  }
+}
+
+project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base {
+  after += Shapes_Receiver_idl_gen Shapes_conn_stub \
+           Shapes_msg_stub Shapes_conn_lem_gen
+
+  libs  += Shapes_conn_stub Shapes_msg_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode
+
+  sharedname = Shapes_Receiver_stub
+  dynamicflags   = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Receiver_compC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Receiver_compC.h
+    GeneratedCode/Shapes_Receiver_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Receiver_compC.inl
+  }
+}
+
+project(Shapes_Receiver_exec) : ciao_executor, dds4ccm_base {
+  after += Shapes_Receiver_lem_stub Shapes_Receiver_stub \
+           Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \
+           DDS4CCM_lem_stub
+
+  libs += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \
+          Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname = Shapes_Receiver_exec
+  dynamicflags   = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Shapes_Receiver_exec.cpp
+  }
+
+  Header_Files {
+    Shapes_Receiver_exec.h
+    GeneratedCode/Shapes_Receiver_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base {
+  after      += Shapes_Receiver_lem_stub Shapes_msg_stub \
+                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \
+                Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+
+  libs       += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \
+                Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \
+                Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+
+  sharedname  = Shapes_Receiver_svnt
+  dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Receiver_compS.cpp
+    GeneratedCode/Shapes_Receiver_comp_svnt.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Receiver_compS.h
+    GeneratedCode/Shapes_Receiver_comp_svnt.h
+    GeneratedCode/Shapes_Receiver_svnt_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Receiver_compS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp
index f5860d3fe76..cf361fba097 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#include "ShapesReceiver_exec.h"
+#include "Shapes_Receiver_exec.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h
index e132abbe3b4..6a4ffd7fd45 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h
@@ -4,9 +4,9 @@
 #ifndef SHAPES_RECEIVER_EXEC_H_
 #define SHAPES_RECEIVER_EXEC_H_
 
-#include "ShapesReceiver_compEC.h"
+#include "Shapes_Receiver_compEC.h"
 
-#include /**/ "ShapesReceiver_exec_export.h"
+#include /**/ "Shapes_Receiver_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc
deleted file mode 100644
index 537e5223698..00000000000
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-project(ShapesSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += Shapes_conn_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \
-              -Wb,stub_export_include=ShapesSender_stub_export.h \
-              -Wb,skel_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
-              -Wb,skel_export_include=ShapesSender_svnt_export.h \
-              -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
-              -Wb,svnt_export_include=ShapesSender_svnt_export.h \
-              -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
-              -Wb,exec_export_include=ShapesSender_exec_export.h \
-              -I../../ports \
-              -I../../ShapesControl_comp/ports \
-              -o GeneratedCode
-
-  IDL_Files {
-    ShapesSender_comp.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += ShapesSender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \
-              -Wb,stub_export_include=ShapesSender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors \
-              -I../../ports \
-              -I../../ports/GeneratedCode \
-              -I../../ShapesControl_comp/ports \
-              -I../../ShapesControl_comp/ports/GeneratedCode \
-              -o GeneratedCode
-
-  IDL_Files {
-    GeneratedCode/ShapesSender_compE.idl
-    gendir = GeneratedCode
-  }
-}
-
-project(ShapesSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += ShapesSender_lem_gen ShapesSender_stub Shapes_msg_stub
-
-  libs  += Shapes_msg_stub ShapesSender_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
-
-  sharedname = ShapesSender_lem_stub
-  dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesSender_compEC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesSender_compEC.h
-    GeneratedCode/ShapesSender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesSender_compEC.inl
-  }
-}
-
-project(ShapesSender_stub) : ccm_stub, dds4ccm_base {
-  after += ShapesSender_idl_gen Shapes_msg_stub Shapes_conn_stub
-
-  libs  += Shapes_msg_stub Shapes_conn_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
-
-  sharedname = ShapesSender_stub
-  dynamicflags   = SHAPES_SENDER_COMP_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesSender_compC.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesSender_compC.h
-    GeneratedCode/ShapesSender_stub_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesSender_compC.inl
-  }
-}
-
-project(ShapesSender_exec) : ciao_executor, dds4ccm_base {
-  after   += ShapesSender_lem_stub ShapesSender_stub Shapes_conn_lem_stub \
-             Shapes_conn_stub ShapesControl_lem_stub ShapesControl_obj_lem_stub \
-             Shapes_defn_stub ShapesControl_obj_stub
-
-  libs += ShapesSender_stub ShapesSender_lem_stub Shapes_msg_stub \
-          Shapes_conn_lem_stub Shapes_conn_stub ShapesControl_lem_stub \
-          ShapesControl_obj_lem_stub Shapes_defn_stub ShapesControl_obj_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \
-              ../../ShapesControl_comp/ports/GeneratedCode
-
-  sharedname = ShapesSender_exec
-  dynamicflags   = SHAPES_SENDER_COMP_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ShapesSender_exec.cpp
-  }
-
-  Header_Files {
-    ShapesSender_exec.h
-    ShapesSender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(ShapesSender_svnt) : ciao_servant, dds4ccm_base {
-  after      += Shapes_msg_stub  ShapesSender_lem_stub DDS4CCM_lem_stub \
-                DDS4CCM_skel Shapes_conn_stub Shapes_conn_svnt \
-                Shapes_conn_lem_stub ShapesControl_svnt \
-                ShapesControl_obj_stub ShapesControl_obj_svnt \
-                ShapesControl_obj_lem_stub
-
-  libs       += ShapesSender_stub ShapesSender_lem_stub  \
-                Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \
-                Shapes_conn_stub Shapes_conn_svnt \
-                Shapes_conn_lem_stub ShapesControl_svnt \
-                ShapesControl_obj_stub ShapesControl_obj_svnt \
-                ShapesControl_obj_lem_stub
-  libpaths += ../../lib
-  libout = ../../lib
-
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode \
-              ../../ShapesControl_comp/ports/GeneratedCode
-
-  sharedname  = ShapesSender_svnt
-  dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GeneratedCode/ShapesSender_compS.cpp
-    GeneratedCode/ShapesSender_comp_svnt.cpp
-  }
-
-  Header_Files {
-    GeneratedCode/ShapesSender_compS.h
-    GeneratedCode/ShapesSender_comp_svnt.h
-    GeneratedCode/ShapesSender_svnt_export.h
-  }
-
-  Inline_Files {
-    GeneratedCode/ShapesSender_compS.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl
index a18d57bcf2d..bbf97849719 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl
@@ -4,7 +4,7 @@
 #define SHAPES_SENDER_COMP_IDL_
 
 #include "Shapes_conn.idl"
-#include "ShapesControl_obj.idl"
+#include "Shapes_Control_obj.idl"
 
 module Shapes
 {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc
new file mode 100644
index 00000000000..e36de466c99
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc
@@ -0,0 +1,174 @@
+// $Id$
+
+project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
+  after += Shapes_conn_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \
+              -Wb,stub_export_include=Shapes_Sender_stub_export.h \
+              -Wb,skel_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
+              -Wb,skel_export_include=Shapes_Sender_svnt_export.h \
+              -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \
+              -Wb,svnt_export_include=Shapes_Sender_svnt_export.h \
+              -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \
+              -Wb,exec_export_include=Shapes_Sender_exec_export.h \
+              -I../../ports \
+              -I../../ShapesControl_comp/ports \
+              -o GeneratedCode
+
+  IDL_Files {
+    Shapes_Sender_comp.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+  after += Shapes_Sender_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \
+              -Wb,stub_export_include=Shapes_Sender_lem_stub_export.h \
+              -SS -Gxhst -I $CIAO_ROOT/connectors \
+              -I../../ports \
+              -I../../ports/GeneratedCode \
+              -I../../ShapesControl_comp/ports \
+              -I../../ShapesControl_comp/ports/GeneratedCode \
+              -o GeneratedCode
+
+  IDL_Files {
+    GeneratedCode/Shapes_Sender_compE.idl
+    gendir = GeneratedCode
+  }
+}
+
+project(Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
+  after += Shapes_Sender_lem_gen Shapes_Sender_stub Shapes_msg_stub
+
+  libs  += Shapes_msg_stub Shapes_Sender_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname = Shapes_Sender_lem_stub
+  dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Sender_compEC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Sender_compEC.h
+    GeneratedCode/Shapes_Sender_lem_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Sender_compEC.inl
+  }
+}
+
+project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base {
+  after += Shapes_Sender_idl_gen Shapes_msg_stub Shapes_conn_stub
+
+  libs  += Shapes_msg_stub Shapes_conn_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname = Shapes_Sender_stub
+  dynamicflags   = SHAPES_SENDER_COMP_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Sender_compC.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Sender_compC.h
+    GeneratedCode/Shapes_Sender_stub_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Sender_compC.inl
+  }
+}
+
+project(Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
+  after   += Shapes_Sender_lem_stub Shapes_Sender_stub Shapes_conn_lem_stub \
+             Shapes_conn_stub Shapes_Control_lem_stub Shapes_Control_obj_lem_stub \
+             Shapes_defn_stub Shapes_Control_obj_stub
+
+  libs += Shapes_Sender_stub Shapes_Sender_lem_stub Shapes_msg_stub \
+          Shapes_conn_lem_stub Shapes_conn_stub Shapes_Control_lem_stub \
+          Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \
+              ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname = Shapes_Sender_exec
+  dynamicflags   = SHAPES_SENDER_COMP_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Shapes_Sender_exec.cpp
+  }
+
+  Header_Files {
+    Shapes_Sender_exec.h
+    Shapes_Sender_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
+  after      += Shapes_msg_stub  Shapes_Sender_lem_stub DDS4CCM_lem_stub \
+                DDS4CCM_skel Shapes_conn_stub Shapes_conn_svnt \
+                Shapes_conn_lem_stub Shapes_Control_svnt \
+                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
+                Shapes_Control_obj_lem_stub
+
+  libs       += Shapes_Sender_stub Shapes_Sender_lem_stub  \
+                Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \
+                Shapes_conn_stub Shapes_conn_svnt \
+                Shapes_conn_lem_stub Shapes_Control_svnt \
+                Shapes_Control_obj_stub Shapes_Control_obj_svnt \
+                Shapes_Control_obj_lem_stub
+  libpaths += ../../lib
+  libout = ../../lib
+
+  includes += ../ports/GeneratedCode ../../ports/GeneratedCode \
+              ../../ShapesControl_comp/ports/GeneratedCode
+
+  sharedname  = Shapes_Sender_svnt
+  dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    GeneratedCode/Shapes_Sender_compS.cpp
+    GeneratedCode/Shapes_Sender_comp_svnt.cpp
+  }
+
+  Header_Files {
+    GeneratedCode/Shapes_Sender_compS.h
+    GeneratedCode/Shapes_Sender_comp_svnt.h
+    GeneratedCode/Shapes_Sender_svnt_export.h
+  }
+
+  Inline_Files {
+    GeneratedCode/Shapes_Sender_compS.inl
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp
index e451a61422e..db7f93beee7 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "ShapesSender_exec.h"
+#include "Shapes_Sender_exec.h"
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h
index 02c2ce1157e..b56e9a0de9d 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h
@@ -4,10 +4,10 @@
 #ifndef CIAO_SENDER_EXEC_H_
 #define CIAO_SENDER_EXEC_H_
 
-#include "ShapesSender_compEC.h"
-#include "ShapesControl_objEC.h"
+#include "Shapes_Sender_compEC.h"
+#include "Shapes_Control_objEC.h"
 
-#include /**/ "ShapesSender_exec_export.h"
+#include /**/ "Shapes_Sender_exec_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once