This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

95 files changed, 177 insertions, 172 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index f41844762f9..eae38394313 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -8,13 +8,13 @@ project(*Notify ConnectDisconnect): notifytest {
 }
 
 
-project(*Notify LifeCycle): notifytest {
+project(*Notify LifeCycle): notifytest, naming {
   Source_Files {
     LifeCycle.cpp
   }
 }
 
-project(*Notify IdAssignment): notifytest {
+project(*Notify IdAssignment): notifytest, naming {
   Source_Files {
     IdAssignment.cpp
   }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index d6e52a015d8..6d96f438923 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -3,8 +3,8 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 #include "IdAssignment.h"
 
 ACE_RCSID (Notify_Tests, 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 7b4a7e3920f..581fa2be9b5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -16,7 +16,7 @@
 #ifndef IDASSIGNMENT_H
 #define IDASSIGNMENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 
 class IdAssignment
 {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 4f48407b6af..bf7a29af1e4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -3,9 +3,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include <orbsvcs/CosNamingC.h>
-#include <orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/CosNotifyChannelAdminC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/CosNotifyCommC.h>
+#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h>
 
 #include "LifeCycle.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 19352ec0150..fd234dcc6e5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -19,7 +19,7 @@
 #include "Notify_Test_Client.h"
 #include "Notify_SequencePushConsumer.h"
 #include "Notify_SequencePushSupplier.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 475e5719d0d..c930e066381 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
+#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 8041f156b35..86b160c2e0a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -19,7 +19,7 @@
 #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
 
 #include "Notify_StructuredPushConsumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 
 class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 97db6fc7f80..bae1c684bf7 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 03c7ce9214a..d1220a50e02 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index b437d7b75e3..c829b8efa06 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
 #include "../lib/Notify_Test_Client.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "ace/OS_main.h"
 
 int
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 4ad43dcb356..7e752c1189f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 46516422f0f..8e5713ebb2d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 427fc996aea..79cf4ff3634 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index 18563673738..fe185bd3254 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 47302392e00..050a2976d53 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 1486816ff5e..5e7b8b6f034 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 #include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index f50a5bc3846..80f3d3ad428 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index 94fdf02c5c1..f6dc8e42ab5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 0e2973152ad..588d83caffc 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index ca6de9a909a..ad410ec2af8 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index f689cb5b866..0434804c2be 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -9,10 +9,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index b06369cba80..a2c96e61b66 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index de8e0d5aae6..cd1c1b579b4 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -9,10 +9,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h
index 679adb0a42c..54ce6c9720a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 188dc2a032c..4a3ac0a1c4d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index ac2b673cd99..a2bfacea20d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 62127227df9..a99fcaa6aec 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index 5b3e48d271f..509fe631c00 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
 #include "common.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 9cc7a728152..e64fd49f725 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -7,8 +7,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index a6c6bac9662..6f2a32690c9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -11,9 +11,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index 2bfe6d28614..de96c575df2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Struct Supp): notifytest {
+project(*Ntf Struct Supp): notifytest, naming {
   exename = Structured_Supplier
 
   Source_Files {
@@ -9,7 +9,7 @@ project(*Ntf Struct Supp): notifytest {
   }
 }
 
-project(*Ntf Struct Cons): notifytest {
+project(*Ntf Struct Cons): notifytest, naming {
   exename = Structured_Consumer
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 54406640c59..622080e1b27 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "controlC.h"
 #include "Notify_Push_Consumer.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 74a90e7f845..fba45d19f79 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -4,9 +4,9 @@
 // Include Section
 // ******************************************************************
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "controlS.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
index 2c9b03fe5ca..b2962f5fba2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Struct Supp): notifytest {
+project(*Ntf Struct Supp): notifytest, naming {
   exename = Structured_Supplier
 
   Source_Files {
@@ -10,7 +10,7 @@ project(*Ntf Struct Supp): notifytest {
   }
 }
 
-project(*Ntf Struct Cons): notifytest {
+project(*Ntf Struct Cons): notifytest, naming {
   exename = Structured_Consumer
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 1673dd1975a..915ce0f8e61 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -7,9 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "controlC.h"
 #include "Notify_Push_Consumer.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 829bc0b9b08..8b4d62ec7b7 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -5,9 +5,9 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Push_Supplier.h"
 #include "controlS.h"
 #include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 4b2e1021bdb..0efa9039997 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index dd0588a2543..75d395824ae 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyFilterS.h"
-#include "orbsvcs/Notify/FilterFactory.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/Notify/FilterFactory.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
index 1964722a76f..3967e5772d7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, rtcorba, etcl, dynamicany, portableserver, iortable {
+project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification, rtcorba, etcl, dynamicany, portableserver, iortable {
 				    
   sharedname = TAO_RT_NotifyTests_Filter
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..429cfe0ca99 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 1a07e216014..1a94c4f4291 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -20,9 +20,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
-//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
+#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
 
 class TAO_Notify_Service;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..24e263b908c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 6cd7f1da60d..bba40b99762 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -21,8 +21,8 @@
 
 #include "ace/Singleton.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 
 class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 60a1e436d08..b85f6540d86 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -16,9 +16,9 @@
 #ifndef NOTIFY_TEST_CLIENT_H
 #define NOTIFY_TEST_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "notify_test_export.h"
 
 class TAO_NOTIFY_TEST_Export Notify_Test_Client
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index b4a0aacf126..c2cb98ffa63 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NotifyTests_Lib): orbsvcslib, notification_skel, naming, svc_utils {
+project(NotifyTests_Lib): orbsvcslib, notification, naming {
   sharedname = TAO_NotifyTests
   dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 2134941a87f..0a257ceed2d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (lib,
            "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 7acd1919324..6cdc20933b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Arg_Shifter.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_Tests_Options_Parser
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 293218f1ae5..f6e11655d40 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (lib,
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
   : poa_name_ (TAO_Notify_Tests_Name::root_poa)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 3273306214b..2df32f45f92 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 279291b2db2..8a042567060 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Notify,
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 template <class Peer_Traits>
 TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 66d655dd9b6..116f4d7fedf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -5,7 +5,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 #include "tao/debug.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
 #include "Task_Stats.h"
 #include "Task_Callback.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 7b3e5527ed7..78929ec2730 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (lib,
 #include "Direct_Consumer.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..977c0f22f64 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 class TAO_Notify_Tests_Periodic_Consumer;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index f637105b924..ded6a360841 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -8,7 +8,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
 #include "Task_Stats.h"
 #include "Task_Callback.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 0378605ffea..6b97740e3ca 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (lib,
 #include "Direct_Supplier.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..a03215cb7b4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 5aae9203447..4c624eb407b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index edf2753e87d..bce5a9a9c9e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 7e4a4773b27..a462f94db79 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index dad8bd6d0eb..441348257e3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index dddecec4dc1..a2a5b236df8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
 
 /**
  * @class TAO_Notify_Tests_StructuredEvent
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 43ee9ffec52..a83edf24f79 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Consumer_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index e1c11dc6a54..e7c04d2e82d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
 
 #include "Supplier_T.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..10c011ee66d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -20,7 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
 /**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index 0c726ed4014..3bc2661b6b9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,12 +1,14 @@
 // $Id$
-project(*Ntf Perf Struct Supp): notifytest, minimum_corba {
+project(*Ntf Perf Struct Supp): notifytest {
+  avoids += minimum_corba
   exename = Structured_Supplier
   Source_Files {
     Structured_Supplier.cpp
   }
 }
 
-project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
+project(*Ntf Perf Struct Cons): notifytest {
+  avoids += minimum_corba
   exename = Structured_Consumer
   Source_Files {
     goC.cpp
@@ -16,14 +18,16 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
   }
 }
 
-project(*Ntf Perf Seq Supp): notifytest, minimum_corba {
+project(*Ntf Perf Seq Supp): notifytest {
+  avoids += minimum_corba
   exename = Sequence_Supplier
   Source_Files {
     Sequence_Supplier.cpp
   }
 }
 
-project(*notify perf Sequence Consumer): notifytest, minimum_corba {
+project(*notify perf Sequence Consumer): notifytest {
+  avoids += minimum_corba
   exename = Sequence_Consumer
   Source_Files {
     goC.cpp
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 1ff4cb087c0..a0cfc9f8a46 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Sequence_Push_Consumer.h"
 #include "goC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 124dca8a155..cff6c00dfe3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_SequencePushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 8c543bd6b44..541266d8cd1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
 
 #include "ace/Get_Opt.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_Structured_Push_Consumer.h"
 #include "goC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index c3cc5ac0f4a..5644e71b127 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
 
 #include "tao/ORB_Core.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "Notify_StructuredPushSupplier.h"
 #include "goS.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -2,8 +2,8 @@
 
 #include "common.h"
 
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
@@ -18,7 +18,7 @@
 #ifndef TAO_COMMON_H
 #define TAO_COMMON_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
 const char*
 Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 619fd2e21b9..8f78c3f2121 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf RedGreen): notifytest {
+project(*Ntf Perf RedGreen): notifytest, naming {
   exename = RedGreen_Test
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index cbb435d4295..1dcc9f2e98a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -4,7 +4,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Notify, 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index a6d83524294..6759d3bc543 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -17,9 +17,9 @@
 #ifndef NOTIFY_RedGreen_Test_CLIENT_H
 #define NOTIFY_RedGreen_Test_CLIENT_H
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 24c72c47766..a298517a58d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -9,8 +9,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
-#include "orbsvcs/Notify/Service.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Notify/Service.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 
 ACE_RCSID (Notify_Tests, 
            Throughput, 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index b16923c43da..d645c76001a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba {
+project(*Ntf Perf Throughput): notifytest, strategies, messaging, naming {
+  avoids += minimum_corba
   exename  = Throughput
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
index cc59624b3fb..acb3f6fee00 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -3,7 +3,7 @@
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
 
 ##---- Load the Factories------
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index fcaa0f1cc8f..33d916bf88f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -2,7 +2,7 @@
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index 61456d1a199..b9b7b4b50cc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 0515ecbd0db..8706e4bd882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index a747c353448..aa0e93c02df 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""