5 files changed, 9 insertions, 9 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)