ChangeLogTag: Sun Jul 06 17:40:19 2003 Pradeep Gore <pradeep@oomworks.com>

408 files changed, 4706 insertions, 4448 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2bd86bce6e7..01d3f1050a3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,45 @@
+Sun Jul 06 17:40:19 2003  Pradeep Gore  <pradeep@oomworks.com>
+	
+	* orbsvcs/tests/Notify/lib:
+	* orbsvcs/tests/Notify/RT_lib:
+	  
+	  Changed all instances of "TAO_NS_" with "TAO_Notify_Tests_" because of
+	  conflicting namespace with the Notify orbsvcs library classes.
+	  This was causing some programs to crash on Win2k.
+
+	* orbsvcs/orbsvcs/Notify:
+	* orbsvcs/Notify_Service/Notify_Service.cpp:
+
+	  Changed all instances of "TAO_NS_" with "TAO_Notify_" as "NS" is
+	  easily confused with the Naming Service. 
+	  
+	* orbsvcs/examples/Notify/Lanes/Supplier.h:
+	* orbsvcs/examples/Notify/Lanes/Supplier.cpp:
+	* orbsvcs/examples/Notify/Lanes/Consumer.h:
+	* orbsvcs/examples/Notify/Lanes/Consumer.cpp:
+	
+	  Appended "Lanes" word to the Supplier and Consumer class
+	  declarations to avoid namespace conflict with the Notify library.
+
+	* orbsvcs/tests/Notify/Lanes/supplier.conf:
+	* orbsvcs/tests/Notify/Lanes/consumer.conf:
+	* orbsvcs/tests/Notify/Lanes/notify.conf:
+ 	  
+	  Commented out directive to use SCHED_FIFO. Using the default
+	  SCHED_OTHER will enable the test to run on solaris and windows
+	  without being root. 
+	
+	* orbsvcs/tests/Notify/lib/Driver.cpp:
+	  
+	  Added a check in the <init> method for available priority
+	  levels and exit gracefully if only 1 level is available.
+	  Thanks to Irfan for code borrowed from his RTCORBA tests.
+	
+	* orbsvcs/examples/Notify/Filter/run_test.pl:
+	* orbsvcs/examples/Notify/Subscribe/run_test.pl:
+	  
+	  Added for convenience.
+
 Sun Jul 6 19:31:01 UTC 2003  Johnny Willemsne  <jwillemsen@remedy.nl>
 
         * examples/RTCORBA/Activity/Makefile.bor:
diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl
new file mode 100755
index 00000000000..0a8753dc3e5
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl
@@ -0,0 +1,73 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../bin";
+use PerlACE::Run_Test;
+
+$experiment_timeout = 60;
+$startup_timeout = 60;
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service");
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior ";
+
+$Filter = new PerlACE::Process ("Filter");
+
+$Filter_Args = "-ORBInitRef NameService=file://$naming_ior";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Filter->Arguments ($Filter_Args);
+$args = $Filter->Arguments ();
+print STDERR "Running Filter with arguments: $args\n";
+$status = $Filter->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Filter returned $status\n";
+    $Filter->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+exit $status;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 00ec0a92488..1290fd43dfb 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -2,19 +2,19 @@
 
 #include "Consumer.h"
 
-ACE_RCSID(Notify, TAO_NS_Consumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Lanes_Consumer, "$id$")
 
-TAO_NS_Consumer::TAO_NS_Consumer (TAO_NS_ORB_Objects& orb_objects)
+TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
 {
 }
 
-TAO_NS_Consumer::~TAO_NS_Consumer (void)
+TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void)
 {
 }
 
 void
-TAO_NS_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL)
 {
   this->default_POA_ = poa;
   this->admin_ = admin;
@@ -24,19 +24,19 @@ TAO_NS_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::Cons
 }
 
 PortableServer::POA_ptr
-TAO_NS_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_NS_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Nothing to do.
 }
 
 void
-TAO_NS_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -73,14 +73,14 @@ TAO_NS_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_NS_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
+TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
@@ -92,7 +92,7 @@ TAO_NS_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
 }
 
 void
-TAO_NS_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification
+TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification
                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -144,7 +144,7 @@ TAO_NS_Consumer::push_structured_event (const CosNotification::StructuredEvent &
 }
 
 void
-TAO_NS_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
@@ -159,7 +159,7 @@ TAO_NS_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index fa424394dd7..861b68d6cd1 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_H
-#define TAO_NS_CONSUMER_H
+#ifndef TAO_Notify_CONSUMER_H
+#define TAO_Notify_CONSUMER_H
 
 #include "ace/pre.h"
 
@@ -20,17 +20,17 @@
 #include "orbsvcs/orbsvcs/CosNotifyCommC.h"
 
 /**
- * @class TAO_NS_Consumer
+ * @class TAO_Notify_Lanes_Consumer
  *
  * @brief Consumer
  *
  */
 
-class TAO_NS_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
+class TAO_Notify_Lanes_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
 {
 public:
   /// Constuctor
-  TAO_NS_Consumer (TAO_NS_ORB_Objects& orb_objects);
+  TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
   void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL);
@@ -42,7 +42,7 @@ protected:
   // = Data members
 
   /// ORB Objects.
-  TAO_NS_ORB_Objects orb_objects_;
+  TAO_Notify_ORB_Objects orb_objects_;
 
   /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
@@ -61,7 +61,7 @@ protected:
 
   // = Methods
   /// Destructor
-  virtual ~TAO_NS_Consumer (void);
+  virtual ~TAO_Notify_Lanes_Consumer (void);
 
   // = ServantBase operations
   virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
@@ -106,4 +106,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_H */
+#endif /* TAO_Notify_CONSUMER_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index a1b7f716bf7..0abd8237b17 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -9,21 +9,21 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 
-ACE_RCSID(Notify, TAO_NS_Consumer_Client, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Lanes_Consumer_Client, "$id$")
 
-TAO_NS_Consumer_Client::TAO_NS_Consumer_Client (TAO_NS_ORB_Objects& orb_objects)
+TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
   , lane_priority_ (0)
   , consumer_ (0)
 {
 }
 
-TAO_NS_Consumer_Client::~TAO_NS_Consumer_Client ()
+TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client ()
 {
 }
 
 int
-TAO_NS_Consumer_Client::parse_args (int argc, char *argv[])
+TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -54,7 +54,7 @@ TAO_NS_Consumer_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_NS_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n"
               , this->lane_priority_, this->event_type_.c_str ()));
@@ -100,14 +100,14 @@ TAO_NS_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Create a Consumer
-  this->consumer_ = new TAO_NS_Consumer (this->orb_objects_);
+  this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_);
 
   // Initialize it.
   this->consumer_->init (rt_poa, consumer_admin, this->event_type_ ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_NS_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var rt_poa;
 
@@ -179,13 +179,13 @@ TAO_NS_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
-TAO_NS_Consumer_Client::svc (void)
+TAO_Notify_Lanes_Consumer_Client::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
@@ -222,14 +222,14 @@ main (int argc, char *argv [])
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_NS_ORB_Objects orb_objects;
+      TAO_Notify_ORB_Objects orb_objects;
 
       orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_NS_ORB_Run_Task orb_run_task (orb_objects);
+      TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
-      TAO_NS_Consumer_Client client (orb_objects);
+      TAO_Notify_Lanes_Consumer_Client client (orb_objects);
 
       if (client.parse_args (argc, argv) != 0)
         {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index ef483c0c8e4..782bf426f5c 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_CLIENT_H
-#define TAO_NS_CONSUMER_CLIENT_H
+#ifndef TAO_Notify_CONSUMER_CLIENT_H
+#define TAO_Notify_CONSUMER_CLIENT_H
 #include "ace/pre.h"
 
 #include "ORB_Objects.h"
@@ -18,22 +18,22 @@
 #include "tao/corba.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
-class TAO_NS_Consumer;
+class TAO_Notify_Lanes_Consumer;
 
 /**
- * @class TAO_NS_Consumer_Client
+ * @class TAO_Notify_Lanes_Consumer_Client
  *
  * @brief
  *
  */
-class TAO_NS_Consumer_Client  : public ACE_Task_Base
+class TAO_Notify_Lanes_Consumer_Client  : public ACE_Task_Base
 {
 public:
   /// Constuctor
-  TAO_NS_Consumer_Client (TAO_NS_ORB_Objects& orb_objects);
+  TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
-  ~TAO_NS_Consumer_Client ();
+  ~TAO_Notify_Lanes_Consumer_Client ();
 
   /// Init
   void initialize (ACE_ENV_SINGLE_ARG_DECL);
@@ -52,7 +52,7 @@ protected:
   PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL);
 
   /// ORB Objects.
-  TAO_NS_ORB_Objects orb_objects_;
+  TAO_Notify_ORB_Objects orb_objects_;
 
   /// Lock to serialize internal state.
   TAO_SYNCH_MUTEX lock_;
@@ -64,11 +64,11 @@ protected:
   RTCORBA::Priority lane_priority_;
 
   /// The Consumer.
-  TAO_NS_Consumer* consumer_;
+  TAO_Notify_Lanes_Consumer* consumer_;
 
   /// The Type the Consumer should subscribe to.
   ACE_CString event_type_;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_CLIENT_H */
+#endif /* TAO_Notify_CONSUMER_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 860d6097f94..6b7580a0255 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -2,14 +2,14 @@
 
 #include "ORB_Objects.h"
 
-ACE_RCSID(Notify, TAO_NS_ORB_Objects, "$id$")
+ACE_RCSID(Notify, TAO_Notify_ORB_Objects, "$id$")
 
-TAO_NS_ORB_Objects::TAO_NS_ORB_Objects (void)
+TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 {
 }
 
 void
-TAO_NS_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
+TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
@@ -47,12 +47,12 @@ TAO_NS_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
   ACE_CHECK;
 }
 
-TAO_NS_ORB_Objects::~TAO_NS_ORB_Objects ()
+TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 {
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NS_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index 8053a7eb1d2..2d9de45a194 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ORB_OBJECTS_H
-#define TAO_NS_ORB_OBJECTS_H
+#ifndef TAO_Notify_ORB_OBJECTS_H
+#define TAO_Notify_ORB_OBJECTS_H
 #include "ace/pre.h"
 
 #include "tao/corba.h"
@@ -20,19 +20,19 @@
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
 /**
- * @class TAO_NS_ORB_Objects
+ * @class TAO_Notify_ORB_Objects
  *
  * @brief Handy Objects that we keep asking the ORB for.
  *
  */
-class TAO_NS_ORB_Objects
+class TAO_Notify_ORB_Objects
 {
 public:
   /// Constuctor
-  TAO_NS_ORB_Objects (void);
+  TAO_Notify_ORB_Objects (void);
 
   /// Destructor
-  ~TAO_NS_ORB_Objects ();
+  ~TAO_Notify_ORB_Objects ();
 
   /// Resolves all the references.
   void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
@@ -53,4 +53,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_ORB_OBJECTS_H */
+#endif /* TAO_Notify_ORB_OBJECTS_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 1ee15b30fcb..ea8601551c0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -2,19 +2,19 @@
 
 #include "ORB_Run_Task.h"
 
-ACE_RCSID(Notify, TAO_NS_ORB_Run_Task, "$id$")
+ACE_RCSID(Notify, TAO_Notify_ORB_Run_Task, "$id$")
 
-TAO_NS_ORB_Run_Task::TAO_NS_ORB_Run_Task (TAO_NS_ORB_Objects& orb_objects)
+TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
 {
 }
 
-TAO_NS_ORB_Run_Task::~TAO_NS_ORB_Run_Task ()
+TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 {
 }
 
 int
-TAO_NS_ORB_Run_Task::svc (void)
+TAO_Notify_ORB_Run_Task::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
index 7fb53b4f1f2..9be9f90501b 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ORB_RUN_TASK_H
-#define TAO_NS_ORB_RUN_TASK_H
+#ifndef TAO_Notify_ORB_RUN_TASK_H
+#define TAO_Notify_ORB_RUN_TASK_H
 #include "ace/pre.h"
 
 #include "ORB_Objects.h"
@@ -18,27 +18,27 @@
 #include "tao/corba.h"
 
 /**
- * @class TAO_NS_ORB_Run_Task
+ * @class TAO_Notify_ORB_Run_Task
  *
  * @brief Run the ORB::run method in a seperate thread.
  *
  */
-class TAO_NS_ORB_Run_Task : public ACE_Task_Base
+class TAO_Notify_ORB_Run_Task : public ACE_Task_Base
 {
 public:
   /// Constuctor
-  TAO_NS_ORB_Run_Task (TAO_NS_ORB_Objects& orb_objects);
+  TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
-  ~TAO_NS_ORB_Run_Task ();
+  ~TAO_Notify_ORB_Run_Task ();
 
   /// The thread entry point.
   virtual int svc (void);
 
 private:
   /// ORB Objects.
-  TAO_NS_ORB_Objects orb_objects_;
+  TAO_Notify_ORB_Objects orb_objects_;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_ORB_RUN_TASK_H */
+#endif /* TAO_Notify_ORB_RUN_TASK_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index af5c8cd69c5..5ff04768ef9 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -2,11 +2,11 @@
 
 #include "Supplier.h"
 
-ACE_RCSID(Notify, TAO_NS_Supplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Lanes_Supplier, "$id$")
 
 #include "tao/ORB_Core.h"
 
-TAO_NS_Supplier::TAO_NS_Supplier  (TAO_NS_ORB_Objects& orb_objects)
+TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier  (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
   , proxy_consumer_id_ (0)
   , expected_consumer_count_ (2)
@@ -15,12 +15,12 @@ TAO_NS_Supplier::TAO_NS_Supplier  (TAO_NS_ORB_Objects& orb_objects)
 {
 }
 
-TAO_NS_Supplier::~TAO_NS_Supplier ()
+TAO_Notify_Lanes_Supplier::~TAO_Notify_Lanes_Supplier ()
 {
 }
 
 void
-TAO_NS_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ACE_ENV_ARG_DECL)
 {
   // First initialize the class members.
   this->admin_ = admin;
@@ -30,7 +30,7 @@ TAO_NS_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expe
 }
 
 void
-TAO_NS_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The Priority at which we send the first event to the first consumer.
   RTCORBA::Priority priority = 1;
@@ -97,7 +97,7 @@ TAO_NS_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Activate the supplier object.
   CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -125,7 +125,7 @@ TAO_NS_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -133,7 +133,7 @@ TAO_NS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
@@ -148,7 +148,7 @@ TAO_NS_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
+TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
@@ -167,7 +167,7 @@ TAO_NS_Supplier::subscription_change (const CosNotification::EventTypeSeq & adde
 }
 
 void
-TAO_NS_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
@@ -176,7 +176,7 @@ TAO_NS_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_E
 }
 
 void
-TAO_NS_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index ebac2f9508c..ef44ffd1223 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIER_H
-#define TAO_NS_SUPPLIER_H
+#ifndef TAO_Notify_SUPPLIER_H
+#define TAO_Notify_SUPPLIER_H
 #include "ace/pre.h"
 
 #include "ORB_Objects.h"
@@ -26,18 +26,18 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_Supplier
+ * @class TAO_Notify_Lanes_Supplier
  *
  * @brief Implement a Structured Supplier.
  *
  */
-class TAO_NS_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
+class TAO_Notify_Lanes_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
 {
  public:
   // = Initialization and Termination code
 
   /// Constructor.
-  TAO_NS_Supplier (TAO_NS_ORB_Objects& orb_objects);
+  TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
   void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count ACE_ENV_ARG_DECL);
@@ -62,7 +62,7 @@ protected:
   virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
 
   /// Destructor
-  virtual ~TAO_NS_Supplier ();
+  virtual ~TAO_Notify_Lanes_Supplier ();
 
   // = NotifySubscribe
   virtual void subscription_change (
@@ -83,7 +83,7 @@ protected:
   /// = Data members
 
   /// ORB Objects.
-  TAO_NS_ORB_Objects orb_objects_;
+  TAO_Notify_ORB_Objects orb_objects_;
 
   /// The proxy that we are connected to.
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
@@ -115,4 +115,4 @@ protected:
 #endif /* _MSC_VER */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIER_H */
+#endif /* TAO_Notify_SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index a45542a3944..82f4914082c 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -10,21 +10,21 @@
 #include "orbsvcs/orbsvcs/NotifyExtC.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
-ACE_RCSID(Notify, TAO_NS_Supplier_Client, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Lanes_Supplier_Client, "$id$")
 
-TAO_NS_Supplier_Client::TAO_NS_Supplier_Client (TAO_NS_ORB_Objects& orb_objects)
+TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects)
   : orb_objects_ (orb_objects)
     ,supplier_ (0)
     , consumer_count_ (2)
 {
 }
 
-TAO_NS_Supplier_Client::~TAO_NS_Supplier_Client ()
+TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client ()
 {
 }
 
 int
-TAO_NS_Supplier_Client::parse_args (int argc, char *argv[])
+TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -60,7 +60,7 @@ TAO_NS_Supplier_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_NS_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
     this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -82,14 +82,14 @@ TAO_NS_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
   // Create a Supplier
-  this->supplier_ = new TAO_NS_Supplier (this->orb_objects_);
+  this->supplier_ = new TAO_Notify_Lanes_Supplier (this->orb_objects_);
 
   // Initialize it.
   this->supplier_->init (supplier_admin, this->consumer_count_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NS_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -154,7 +154,7 @@ TAO_NS_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   /// First, signal that the supplier is ready.
   this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -164,7 +164,7 @@ TAO_NS_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -186,7 +186,7 @@ TAO_NS_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_NS_Supplier_Client::svc (void)
+TAO_Notify_Lanes_Supplier_Client::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
@@ -223,16 +223,16 @@ main (int argc, char *argv [])
       ACE_TRY_CHECK;
 
       // Create a holder for the common ORB Objects.
-      TAO_NS_ORB_Objects orb_objects;
+      TAO_Notify_ORB_Objects orb_objects;
 
       orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /* Run the ORB in a seperate thread */
-      TAO_NS_ORB_Run_Task orb_run_task (orb_objects);
+      TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
       /* Create a Client */
-      TAO_NS_Supplier_Client client (orb_objects);
+      TAO_Notify_Lanes_Supplier_Client client (orb_objects);
 
       if (client.parse_args (argc, argv) != 0)
         {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index f8b0c8a247e..cf99f8ee62e 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -9,30 +9,30 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIER_CLIENT_H
-#define TAO_NS_SUPPLIER_CLIENT_H
+#ifndef TAO_Notify_SUPPLIER_CLIENT_H
+#define TAO_Notify_SUPPLIER_CLIENT_H
 #include "ace/pre.h"
 
 #include "ORB_Objects.h"
 #include "ace/Task.h"
 #include "tao/corba.h"
 
-class TAO_NS_Supplier;
+class TAO_Notify_Lanes_Supplier;
 
 /**
- * @class TAO_NS_Supplier_Client
+ * @class TAO_Notify_Lanes_Supplier_Client
  *
  * @brief Supplier Client
  *
  */
-class TAO_NS_Supplier_Client : public ACE_Task_Base
+class TAO_Notify_Lanes_Supplier_Client : public ACE_Task_Base
 {
 public:
   /// Constuctor
-  TAO_NS_Supplier_Client (TAO_NS_ORB_Objects& orb_objects);
+  TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
-  ~TAO_NS_Supplier_Client ();
+  ~TAO_Notify_Lanes_Supplier_Client ();
 
   /// Init
   void initialize (ACE_ENV_SINGLE_ARG_DECL);
@@ -54,10 +54,10 @@ protected:
   void write_ior (ACE_ENV_SINGLE_ARG_DECL);
 
   /// ORB Objects.
-  TAO_NS_ORB_Objects orb_objects_;
+  TAO_Notify_ORB_Objects orb_objects_;
 
   /// Supplier that sends events.
-  TAO_NS_Supplier* supplier_;
+  TAO_Notify_Lanes_Supplier* supplier_;
 
   /// The Number of consumers that we expect to send an event to.
   int consumer_count_;
@@ -67,4 +67,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIER_CLIENT_H */
+#endif /* TAO_Notify_SUPPLIER_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl
new file mode 100755
index 00000000000..7b14c5cee62
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl
@@ -0,0 +1,73 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../bin";
+use PerlACE::Run_Test;
+
+$experiment_timeout = 60;
+$startup_timeout = 60;
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service");
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior ";
+
+$Subscribe = new PerlACE::Process ("Subscribe");
+
+$Subscribe_Args = "-ORBInitRef NameService=file://$naming_ior";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Subscribe->Arguments ($Subscribe_Args);
+$args = $Subscribe->Arguments ();
+print STDERR "Running Subscribe with arguments: $args\n";
+$status = $Subscribe->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Subscribe returned $status\n";
+    $Subscribe->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+exit $status;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index ec510943c8f..58613798b26 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -5,7 +5,7 @@
 #include "Admin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Admin, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Admin, "$Id$")
 
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 
@@ -13,32 +13,32 @@ ACE_RCSID(Notify, TAO_NS_Admin, "$Id$")
 #include "Proxy.h"
 #include "EventChannel.h"
 
-TAO_NS_Admin::TAO_NS_Admin (void)
+TAO_Notify_Admin::TAO_Notify_Admin (void)
   : ec_ (0)
   , proxy_container_ (0)
   , filter_operator_ (CosNotifyChannelAdmin::OR_OP)
 {
   // Initialize all Admin objects to initially be subscribed for all events.
   // This is a reasonable default and is required to allow Cos Event consumers/suppliers to send/receive events,
-  this->subscribed_types_.insert (TAO_NS_EventType::special ());
+  this->subscribed_types_.insert (TAO_Notify_EventType::special ());
 }
 
-TAO_NS_Admin::~TAO_NS_Admin ()
+TAO_Notify_Admin::~TAO_Notify_Admin ()
 {
   this->ec_->_decr_refcnt ();
 }
 
 void
-TAO_NS_Admin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
 {
   this->ec_ = ec;
 
   this->ec_->_incr_refcnt ();
 
-  this->TAO_NS_Object::init (ec);
+  this->TAO_Notify_Object::init (ec);
 
   ACE_NEW_THROW_EX (this->proxy_container_,
-                    TAO_NS_Proxy_Container (),
+                    TAO_Notify_Proxy_Container (),
                     CORBA::INTERNAL ());
   ACE_CHECK;
 
@@ -48,14 +48,14 @@ TAO_NS_Admin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_Admin::remove (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
 {
   this->proxy_container_->remove (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_NS_Admin::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -66,9 +66,9 @@ TAO_NS_Admin::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_AR
 }
 
 int
-TAO_NS_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->proxy_container_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -80,19 +80,19 @@ TAO_NS_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Admin::insert (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
 {
   this->proxy_container_->insert (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>;
-template class TAO_NS_Container_T <TAO_NS_Proxy>;
+template class TAO_ESF_Shutdown_Proxy<TAO_Notify_Proxy>;
+template class TAO_Notify_Container_T <TAO_Notify_Proxy>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>
-#pragma instantiate TAO_NS_Container_T <TAO_NS_Proxy>
+#pragma TAO_ESF_Shutdown_Proxy<TAO_Notify_Proxy>
+#pragma instantiate TAO_Notify_Container_T <TAO_Notify_Proxy>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index a456a774995..1d34efbc74b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ADMIN_H
-#define TAO_NS_ADMIN_H
+#ifndef TAO_Notify_ADMIN_H
+#define TAO_Notify_ADMIN_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,41 +23,41 @@
 #include "EventTypeSeq.h"
 #include "Object.h"
 
-class TAO_NS_Proxy;
-class TAO_NS_EventChannel;
-template <class TYPE> class TAO_NS_Container_T;
+class TAO_Notify_Proxy;
+class TAO_Notify_EventChannel;
+template <class TYPE> class TAO_Notify_Container_T;
 
 /**
- * @class TAO_NS_Admin
+ * @class TAO_Notify_Admin
  *
  * @brief Base class for the ConsumerAdmin and SupplierAdmin.
  *
  */
 
-class TAO_Notify_Export TAO_NS_Admin : public virtual TAO_NS_Object
+class TAO_Notify_Export TAO_Notify_Admin : public virtual TAO_Notify_Object
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   typedef CosNotifyChannelAdmin::AdminIDSeq SEQ;
   typedef CosNotifyChannelAdmin::AdminIDSeq_var SEQ_VAR;
 
   /// Constuctor
-  TAO_NS_Admin (void);
+  TAO_Notify_Admin (void);
 
   /// Destructor
-  ~TAO_NS_Admin ();
+  ~TAO_Notify_Admin ();
 
   /// Init
-  void init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
 
   /// Insert the proxy in the <proxy_container_>.
-  void insert (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL);
+  void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
 
   /// Remove type from container_
-  void remove (TAO_NS_Proxy *proxy ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_Proxy *proxy ACE_ENV_ARG_DECL);
 
   /// Access Admin FilterAdmin.
-  TAO_NS_FilterAdmin& filter_admin (void);
+  TAO_Notify_FilterAdmin& filter_admin (void);
 
   /// Set Filter operator
   void filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator);
@@ -66,27 +66,27 @@ public:
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
 
   /// Obtain the Admin's subscribed types.
-  void subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL);
 
   /// Shutdown
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
-  typedef TAO_NS_Container_T <TAO_NS_Proxy> TAO_NS_Proxy_Container;
+  typedef TAO_Notify_Container_T <TAO_Notify_Proxy> TAO_Notify_Proxy_Container;
 
   /// = Data Members
 
   /// The EventChannel.
-  TAO_NS_EventChannel *ec_;
+  TAO_Notify_EventChannel *ec_;
 
   /// The Proxy Container.
-  TAO_NS_Proxy_Container *proxy_container_;
+  TAO_Notify_Proxy_Container *proxy_container_;
 
   /// The types that we've subscribed our proxy objects with the event manager.
-  TAO_NS_EventTypeSeq subscribed_types_;
+  TAO_Notify_EventTypeSeq subscribed_types_;
 
   /// Filter Administration
-  TAO_NS_FilterAdmin filter_admin_;
+  TAO_Notify_FilterAdmin filter_admin_;
 
   /// Filter operator
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator_;
@@ -97,4 +97,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ADMIN_H */
+#endif /* TAO_Notify_ADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
index 2975697d92a..8b6d8641eeb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -1,19 +1,19 @@
 // $Id$
 
-ACE_INLINE TAO_NS_FilterAdmin&
-TAO_NS_Admin::filter_admin (void)
+ACE_INLINE TAO_Notify_FilterAdmin&
+TAO_Notify_Admin::filter_admin (void)
 {
   return this->filter_admin_;
 }
 
 ACE_INLINE void
-TAO_NS_Admin::filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator)
+TAO_Notify_Admin::filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator)
 {
   this->filter_operator_ = filter_operator;
 }
 
 ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NS_Admin::filter_operator (void)
+TAO_Notify_Admin::filter_operator (void)
 {
   return this->filter_operator_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 9f5e56ece6d..cc2da8aab0a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -6,11 +6,11 @@
 #include "AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_AdminProperties, "$id$")
+ACE_RCSID(Notify, TAO_Notify_AdminProperties, "$id$")
 
 #include "orbsvcs/CosNotificationC.h"
 
-TAO_NS_AdminProperties::TAO_NS_AdminProperties (void)
+TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void)
   : max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
   , max_consumers_ (CosNotification::MaxConsumers, 0)
   , max_suppliers_ (CosNotification::MaxSuppliers, 0)
@@ -20,14 +20,14 @@ TAO_NS_AdminProperties::TAO_NS_AdminProperties (void)
 {
 }
 
-TAO_NS_AdminProperties::~TAO_NS_AdminProperties ()
+TAO_Notify_AdminProperties::~TAO_Notify_AdminProperties ()
 {
 }
 
 int
-TAO_NS_AdminProperties::init (const CosNotification::PropertySeq& prop_seq)
+TAO_Notify_AdminProperties::init (const CosNotification::PropertySeq& prop_seq)
 {
-  if (TAO_NS_PropertySeq::init (prop_seq) != 0)
+  if (TAO_Notify_PropertySeq::init (prop_seq) != 0)
     return -1;
 
   this->max_global_queue_length_.set (*this);
@@ -42,7 +42,7 @@ TAO_NS_AdminProperties::init (const CosNotification::PropertySeq& prop_seq)
 }
 
 CORBA::Boolean
-TAO_NS_AdminProperties::queue_full (void)
+TAO_Notify_AdminProperties::queue_full (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, 1);
 
@@ -59,12 +59,12 @@ TAO_NS_AdminProperties::queue_full (void)
 
 template class ACE_Atomic_Op<TAO_SYNCH_MUTEX,int>;
 template class ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX,int>;
-template class ACE_Refcounted_Auto_Ptr<TAO_NS_AdminProperties, TAO_SYNCH_MUTEX>;
+template class ACE_Refcounted_Auto_Ptr<TAO_Notify_AdminProperties, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX,int>
 #pragma instantiate ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX,int>
-#pragma ACE_Refcounted_Auto_Ptr<TAO_NS_AdminProperties, TAO_SYNCH_MUTEX>
+#pragma ACE_Refcounted_Auto_Ptr<TAO_Notify_AdminProperties, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index e05e06d2b1c..f7bbd9409e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ADMINPROPERTIES_H
-#define TAO_NS_ADMINPROPERTIES_H
+#ifndef TAO_Notify_ADMINPROPERTIES_H
+#define TAO_Notify_ADMINPROPERTIES_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -28,35 +28,35 @@
 #include "Property_Boolean.h"
 
 /**
- * @class TAO_NS_AdminProperties
+ * @class TAO_Notify_AdminProperties
  *
  * @brief The AdminProperties per EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_AdminProperties : public TAO_NS_PropertySeq
+class TAO_Notify_Export TAO_Notify_AdminProperties : public TAO_Notify_PropertySeq
 {
 public:
   /// Constuctor
-  TAO_NS_AdminProperties (void);
+  TAO_Notify_AdminProperties (void);
 
   /// Destructor
-  ~TAO_NS_AdminProperties ();
+  ~TAO_Notify_AdminProperties ();
 
   // Init
   int init (const CosNotification::PropertySeq& prop_seq);
 
   // = Accessors
-  const TAO_NS_Property_Long& max_global_queue_length (void) const;
-  const TAO_NS_Property_Long& max_consumers (void) const;
-  const TAO_NS_Property_Long& max_suppliers (void) const;
-  const TAO_NS_Property_Boolean& reject_new_events (void) const;
+  const TAO_Notify_Property_Long& max_global_queue_length (void) const;
+  const TAO_Notify_Property_Long& max_consumers (void) const;
+  const TAO_Notify_Property_Long& max_suppliers (void) const;
+  const TAO_Notify_Property_Boolean& reject_new_events (void) const;
 
   CORBA::Long& global_queue_length (void);
   TAO_SYNCH_MUTEX& global_queue_lock (void);
   TAO_SYNCH_CONDITION& global_queue_not_full_condition (void);
 
-  TAO_NS_Atomic_Property_Long& consumers (void);
-  TAO_NS_Atomic_Property_Long& suppliers (void);
+  TAO_Notify_Atomic_Property_Long& consumers (void);
+  TAO_Notify_Atomic_Property_Long& suppliers (void);
 
   // = Helper method
   /// Returns true if Queue is full
@@ -74,18 +74,18 @@ protected:
    * the channel begins discarding events or rejecting new events upon
    * receipt of each new event.
    */
-  TAO_NS_Property_Long max_global_queue_length_;
+  TAO_Notify_Property_Long max_global_queue_length_;
 
   /// The maximum number of consumers that can be connected to the channel at
   /// any given time.
-  TAO_NS_Property_Long max_consumers_;
+  TAO_Notify_Property_Long max_consumers_;
 
   /// The maximum number of suppliers that can be connected to the channel at
   /// any given time.
-  TAO_NS_Property_Long max_suppliers_;
+  TAO_Notify_Property_Long max_suppliers_;
 
   /// Reject any new event.
-  TAO_NS_Property_Boolean reject_new_events_;
+  TAO_Notify_Property_Boolean reject_new_events_;
 
   //= Variables
   /// This is used to count the queue length across all buffers in the Notify Service
@@ -100,15 +100,15 @@ protected:
 
   /// These are used to count the number of consumers and suppliers connected to
   /// the system.
-  TAO_NS_Atomic_Property_Long consumers_;
-  TAO_NS_Atomic_Property_Long suppliers_;
+  TAO_Notify_Atomic_Property_Long consumers_;
+  TAO_Notify_Atomic_Property_Long suppliers_;
 };
 
-typedef ACE_Refcounted_Auto_Ptr<TAO_NS_AdminProperties, TAO_SYNCH_MUTEX> TAO_NS_AdminProperties_var;
+typedef ACE_Refcounted_Auto_Ptr<TAO_Notify_AdminProperties, TAO_SYNCH_MUTEX> TAO_Notify_AdminProperties_var;
 
 #if defined (__ACE_INLINE__)
 #include "AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ADMINPROPERTIES_H */
+#endif /* TAO_Notify_ADMINPROPERTIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index 4abdd9b071a..0eea011af97 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -1,55 +1,55 @@
 // $Id$
 
-ACE_INLINE const TAO_NS_Property_Long&
-TAO_NS_AdminProperties::max_global_queue_length (void) const
+ACE_INLINE const TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_global_queue_length (void) const
 {
   return this->max_global_queue_length_;
 }
 
-ACE_INLINE const TAO_NS_Property_Long&
-TAO_NS_AdminProperties::max_consumers (void) const
+ACE_INLINE const TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_consumers (void) const
 {
   return this->max_consumers_;
 }
 
-ACE_INLINE const TAO_NS_Property_Long&
-TAO_NS_AdminProperties::max_suppliers (void) const
+ACE_INLINE const TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_suppliers (void) const
 {
   return this->max_suppliers_;
 }
 
-ACE_INLINE const TAO_NS_Property_Boolean&
-TAO_NS_AdminProperties::reject_new_events (void) const
+ACE_INLINE const TAO_Notify_Property_Boolean&
+TAO_Notify_AdminProperties::reject_new_events (void) const
 {
   return this->reject_new_events_;
 }
 
 ACE_INLINE CORBA::Long&
-TAO_NS_AdminProperties::global_queue_length (void)
+TAO_Notify_AdminProperties::global_queue_length (void)
 {
   return this->global_queue_length_;
 }
 
 ACE_INLINE TAO_SYNCH_MUTEX&
-TAO_NS_AdminProperties::global_queue_lock (void)
+TAO_Notify_AdminProperties::global_queue_lock (void)
 {
   return this->global_queue_lock_;
 }
 
 ACE_INLINE TAO_SYNCH_CONDITION&
-TAO_NS_AdminProperties::global_queue_not_full_condition (void)
+TAO_Notify_AdminProperties::global_queue_not_full_condition (void)
 {
   return this->global_queue_not_full_condition_;
 }
 
-ACE_INLINE TAO_NS_Atomic_Property_Long&
-TAO_NS_AdminProperties::consumers (void)
+ACE_INLINE TAO_Notify_Atomic_Property_Long&
+TAO_Notify_AdminProperties::consumers (void)
 {
   return this->consumers_;
 }
 
-ACE_INLINE TAO_NS_Atomic_Property_Long&
-TAO_NS_AdminProperties::suppliers (void)
+ACE_INLINE TAO_Notify_Atomic_Property_Long&
+TAO_Notify_AdminProperties::suppliers (void)
 {
   return this->suppliers_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index bf16f89d514..478990fa9a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -6,48 +6,48 @@
 #include "AnyEvent.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_AnyEvent, "$id$")
+ACE_RCSID(Notify, TAO_Notify_AnyEvent, "$id$")
 
 #include "../Consumer.h"
 #include "tao/debug.h"
 
-TAO_NS_EventType TAO_NS_AnyEvent_No_Copy::event_type_;
+TAO_Notify_EventType TAO_Notify_AnyEvent_No_Copy::event_type_;
 
-TAO_NS_AnyEvent_No_Copy::TAO_NS_AnyEvent_No_Copy (const CORBA::Any &event)
+TAO_Notify_AnyEvent_No_Copy::TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event)
   : event_ (&event)
 {
 }
 
-TAO_NS_AnyEvent_No_Copy::~TAO_NS_AnyEvent_No_Copy ()
+TAO_Notify_AnyEvent_No_Copy::~TAO_Notify_AnyEvent_No_Copy ()
 {
 }
 
-TAO_NS_Event*
-TAO_NS_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_Event*
+TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_NS_Event* copy;
+  TAO_Notify_Event* copy;
 
   ACE_NEW_THROW_EX (copy,
-                    TAO_NS_AnyEvent (*this->event_),
+                    TAO_Notify_AnyEvent (*this->event_),
                     CORBA::NO_MEMORY ());
 
   return copy;
 }
 
-const TAO_NS_EventType&
-TAO_NS_AnyEvent_No_Copy::type (void) const
+const TAO_Notify_EventType&
+TAO_Notify_AnyEvent_No_Copy::type (void) const
 {
   return this->event_type_;
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
+TAO_Notify_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
 {
-  TAO_NS_Event::translate (*this->event_, notification);
+  TAO_Notify_Event::translate (*this->event_, notification);
 }
 
 CORBA::Boolean
-TAO_NS_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -57,7 +57,7 @@ TAO_NS_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_AR
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -67,46 +67,46 @@ TAO_NS_AnyEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (*this->event_, notification);
+  TAO_Notify_Event::translate (*this->event_, notification);
 
   forwarder->forward_structured (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (*this->event_, notification);
+  TAO_Notify_Event::translate (*this->event_, notification);
 
   forwarder->forward_structured_no_filtering (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_any (*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 /*****************************************************************************************************/
 
-TAO_NS_AnyEvent::TAO_NS_AnyEvent (const CORBA::Any &event)
-  : TAO_NS_AnyEvent_No_Copy (event)
+TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event)
+  : TAO_Notify_AnyEvent_No_Copy (event)
     , any_copy_ (event)
 {
   this->event_ = &any_copy_;
 }
 
-TAO_NS_AnyEvent::~TAO_NS_AnyEvent ()
+TAO_Notify_AnyEvent::~TAO_Notify_AnyEvent ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 79896de3930..5f8d0fbba15 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ANYEVENT_H
-#define TAO_NS_ANYEVENT_H
+#ifndef TAO_Notify_ANYEVENT_H
+#define TAO_Notify_ANYEVENT_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -23,29 +23,29 @@
 #include "../EventType.h"
 #include "orbsvcs/CosNotificationC.h"
 
-class TAO_NS_Consumer;
+class TAO_Notify_Consumer;
 
 /**
- * @class TAO_NS_AnyEvent
+ * @class TAO_Notify_AnyEvent
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_AnyEvent_No_Copy : public TAO_NS_Event
+class TAO_Notify_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_AnyEvent_No_Copy (const CORBA::Any &event);
+  TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event);
 
   /// Destructor
-  ~TAO_NS_AnyEvent_No_Copy ();
+  ~TAO_Notify_AnyEvent_No_Copy ();
 
   /// Copy the event.
-  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
 
   /// Get the event type.
-  virtual const TAO_NS_EventType& type (void) const;
+  virtual const TAO_Notify_EventType& type (void) const;
 
   CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
@@ -53,7 +53,7 @@ public:
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Push event to consumer
-  virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
   virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
@@ -72,25 +72,25 @@ protected:
   const CORBA::Any* event_;
 
   /// Our event type.
-  static TAO_NS_EventType event_type_;
+  static TAO_Notify_EventType event_type_;
 };
 
 /*****************************************************************************************************/
 
 /**
- * @class TAO_NS_AnyEvent
+ * @class TAO_Notify_AnyEvent
  *
  * @brief AnyEvent implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_AnyEvent : public TAO_NS_AnyEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_AnyEvent (const CORBA::Any &event);
+  TAO_Notify_AnyEvent (const CORBA::Any &event);
 
   /// Destructor
-  ~TAO_NS_AnyEvent ();
+  ~TAO_Notify_AnyEvent ();
 
 protected:
   /// Copy of the Event.
@@ -102,4 +102,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ANYEVENT_H */
+#endif /* TAO_Notify_ANYEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index ae3ae49ae8f..ab6ac6870ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "CosEC_ProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_CosEC_ProxyPushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$id$")
 
 #include "tao/debug.h"
 #include "../AdminProperties.h"
@@ -15,26 +15,26 @@ ACE_RCSID(Notify, TAO_NS_CosEC_ProxyPushConsumer, "$id$")
 #include "AnyEvent.h"
 #include "PushSupplier.h"
 
-TAO_NS_CosEC_ProxyPushConsumer::TAO_NS_CosEC_ProxyPushConsumer (void)
+TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void)
 {
 }
 
-TAO_NS_CosEC_ProxyPushConsumer::~TAO_NS_CosEC_ProxyPushConsumer ()
+TAO_Notify_CosEC_ProxyPushConsumer::~TAO_Notify_CosEC_ProxyPushConsumer ()
 {
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::release (void)
+TAO_Notify_CosEC_ProxyPushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_CosEC_ProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_CosEC_ProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -43,14 +43,14 @@ TAO_NS_CosEC_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::push (TAO_NS_Event_var &/*event*/)
+TAO_Notify_CosEC_ProxyPushConsumer::push (TAO_Notify_Event_var &/*event*/)
 {
   // This should never be called.
   ACE_ASSERT (1);
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -66,24 +66,24 @@ TAO_NS_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  TAO_NS_AnyEvent_No_Copy event (any);
+  TAO_Notify_AnyEvent_No_Copy event (any);
 
-  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
   // Convert Supplier to Base Type
-  TAO_NS_PushSupplier *supplier;
+  TAO_Notify_PushSupplier *supplier;
   ACE_NEW_THROW_EX (supplier,
-                    TAO_NS_PushSupplier (this),
+                    TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
@@ -92,7 +92,7 @@ TAO_NS_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplie
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
 }
 
-void TAO_NS_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 08b822c921f..6bbdcf775aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COSEC_PROXYPUSHCONSUMER_H
-#define TAO_NS_COSEC_PROXYPUSHCONSUMER_H
+#ifndef TAO_Notify_COSEC_PROXYPUSHCONSUMER_H
+#define TAO_Notify_COSEC_PROXYPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -30,20 +30,20 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_CosEC_ProxyPushConsumer
+ * @class TAO_Notify_CosEC_ProxyPushConsumer
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_CosEC_ProxyPushConsumer : public virtual TAO_NS_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
+class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
 {
- friend class TAO_NS_Builder;
+ friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_CosEC_ProxyPushConsumer (void);
+  TAO_Notify_CosEC_ProxyPushConsumer (void);
 
   /// Destructor
-  ~TAO_NS_CosEC_ProxyPushConsumer ();
+  ~TAO_Notify_CosEC_ProxyPushConsumer ();
 
   /// Release
   virtual void release (void);
@@ -71,8 +71,8 @@ protected:
                      CORBA::SystemException
                      ));
 private:
-  // Overloaded TAO_NS_ProxyConsumer::push to get around Borland compiler warnings.
-  virtual void push (TAO_NS_Event_var &event);
+  // Overloaded TAO_Notify_ProxyConsumer::push to get around Borland compiler warnings.
+  virtual void push (TAO_Notify_Event_var &event);
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -84,4 +84,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_COSEC_PROXYPUSHCONSUMER_H */
+#endif /* TAO_Notify_COSEC_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index c4c139cf9c8..0658ed02f2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -6,24 +6,24 @@
 #include "CosEC_ProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_CosEC_ProxyPushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$id$")
 
 #include "tao/debug.h"
 #include "PushConsumer.h"
 
-TAO_NS_CosEC_ProxyPushSupplier::TAO_NS_CosEC_ProxyPushSupplier (void)
+TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void)
 {
 }
 
-TAO_NS_CosEC_ProxyPushSupplier::~TAO_NS_CosEC_ProxyPushSupplier ()
+TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier ()
 {
 }
 
 void
-TAO_NS_CosEC_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_ProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_ProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -32,7 +32,7 @@ TAO_NS_CosEC_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_CosEC_ProxyPushSupplier::release (void)
+TAO_Notify_CosEC_ProxyPushSupplier::release (void)
 {
   this->consumer_->release ();
 
@@ -41,7 +41,7 @@ TAO_NS_CosEC_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_NS_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
+TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
                                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -50,9 +50,9 @@ TAO_NS_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsume
                    ))
 {
   // Convert Consumer to Base Type
-  TAO_NS_PushConsumer* consumer;
+  TAO_Notify_PushConsumer* consumer;
   ACE_NEW_THROW_EX (consumer,
-                    TAO_NS_PushConsumer (this),
+                    TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
   consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
@@ -62,7 +62,7 @@ TAO_NS_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsume
 }
 
 void
-TAO_NS_CosEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 3f3a794e2b8..711865a91f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COSEC_PROXYPUSHSUPPLIER_H
-#define TAO_NS_COSEC_PROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_COSEC_PROXYPUSHSUPPLIER_H
+#define TAO_Notify_COSEC_PROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -31,24 +31,24 @@
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
+TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 /**
- * @class TAO_NS_CosEC_ProxyPushSupplier
+ * @class TAO_Notify_CosEC_ProxyPushSupplier
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_CosEC_ProxyPushSupplier : public virtual TAO_NS_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
+class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_CosEC_ProxyPushSupplier (void);
+  TAO_Notify_CosEC_ProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_CosEC_ProxyPushSupplier ();
+  ~TAO_Notify_CosEC_ProxyPushSupplier ();
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
@@ -84,4 +84,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_COSEC_PROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_COSEC_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index f2d774756b8..8e3ce3f7923 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "ProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ProxyPushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_ProxyPushConsumer, "$id$")
 
 #include "tao/debug.h"
 #include "../AdminProperties.h"
@@ -15,16 +15,16 @@ ACE_RCSID(Notify, TAO_NS_ProxyPushConsumer, "$id$")
 #include "AnyEvent.h"
 #include "PushSupplier.h"
 
-TAO_NS_ProxyPushConsumer::TAO_NS_ProxyPushConsumer (void)
+TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void)
 {
 }
 
-TAO_NS_ProxyPushConsumer::~TAO_NS_ProxyPushConsumer ()
+TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer ()
 {
 }
 
 void
-TAO_NS_ProxyPushConsumer::release (void)
+TAO_Notify_ProxyPushConsumer::release (void)
 {
   if (this->supplier_)
     this->supplier_->release ();
@@ -34,10 +34,10 @@ TAO_NS_ProxyPushConsumer::release (void)
 }
 
 void
-TAO_NS_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_ProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_ProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -46,7 +46,7 @@ TAO_NS_ProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -55,14 +55,14 @@ TAO_NS_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_ProxyPushConsumer::push (TAO_NS_Event_var &/*event*/)
+TAO_Notify_ProxyPushConsumer::push (TAO_Notify_Event_var &/*event*/)
 {
   // This should never be called.
   ACE_ASSERT (1);
 }
 
 void
-TAO_NS_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -78,24 +78,24 @@ TAO_NS_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  TAO_NS_AnyEvent_No_Copy event (any);
+  TAO_Notify_AnyEvent_No_Copy event (any);
 
-  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
   // Convert Supplier to Base Type
-  TAO_NS_PushSupplier *supplier;
+  TAO_Notify_PushSupplier *supplier;
   ACE_NEW_THROW_EX (supplier,
-                    TAO_NS_PushSupplier (this),
+                    TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
@@ -104,7 +104,7 @@ TAO_NS_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
 }
 
-void TAO_NS_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 90a6fd5a7c4..fc4d11b7416 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYPUSHCONSUMER_H
-#define TAO_NS_PROXYPUSHCONSUMER_H
+#ifndef TAO_Notify_PROXYPUSHCONSUMER_H
+#define TAO_Notify_PROXYPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -30,20 +30,20 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_ProxyPushConsumer
+ * @class TAO_Notify_ProxyPushConsumer
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyPushConsumer : public virtual TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
+class TAO_Notify_Export TAO_Notify_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
 {
- friend class TAO_NS_Builder;
+ friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_ProxyPushConsumer (void);
+  TAO_Notify_ProxyPushConsumer (void);
 
   /// Destructor
-  ~TAO_NS_ProxyPushConsumer ();
+  ~TAO_Notify_ProxyPushConsumer ();
 
   /// Release
   virtual void release (void);
@@ -77,8 +77,8 @@ protected:
                      ));
 
 private:
-  // Overloaded TAO_NS_ProxyConsumer::push to get around Borland compiler warnings.
-  virtual void push (TAO_NS_Event_var &event);
+  // Overloaded TAO_Notify_ProxyConsumer::push to get around Borland compiler warnings.
+  virtual void push (TAO_Notify_Event_var &event);
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -90,4 +90,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYPUSHCONSUMER_H */
+#endif /* TAO_Notify_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index 81612398502..85c3af70878 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -6,24 +6,24 @@
 #include "ProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ProxyPushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_ProxyPushSupplier, "$id$")
 
 #include "tao/debug.h"
 #include "PushConsumer.h"
 
-TAO_NS_ProxyPushSupplier::TAO_NS_ProxyPushSupplier (void)
+TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void)
 {
 }
 
-TAO_NS_ProxyPushSupplier::~TAO_NS_ProxyPushSupplier ()
+TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier ()
 {
 }
 
 void
-TAO_NS_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_ProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_ProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -32,7 +32,7 @@ TAO_NS_ProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ProxyPushSupplier::release (void)
+TAO_Notify_ProxyPushSupplier::release (void)
 {
   if (this->consumer_)
     this->consumer_->release ();
@@ -42,7 +42,7 @@ TAO_NS_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_NS_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
+TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
                                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -51,9 +51,9 @@ TAO_NS_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_
                    ))
 {
   // Convert Consumer to Base Type
-  TAO_NS_PushConsumer* consumer;
+  TAO_Notify_PushConsumer* consumer;
   ACE_NEW_THROW_EX (consumer,
-                    TAO_NS_PushConsumer (this),
+                    TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
   consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
@@ -63,7 +63,7 @@ TAO_NS_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_
 }
 
 void
-TAO_NS_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -72,7 +72,7 @@ TAO_NS_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_ProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index 8d2e9bb8277..a8632a10330 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYPUSHSUPPLIER_H
-#define TAO_NS_PROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_PROXYPUSHSUPPLIER_H
+#define TAO_Notify_PROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -32,29 +32,29 @@
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
+TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 /**
- * @class TAO_NS_ProxyPushSupplier
+ * @class TAO_Notify_ProxyPushSupplier
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyPushSupplier : public virtual TAO_NS_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
+class TAO_Notify_Export TAO_Notify_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_ProxyPushSupplier (void);
+  TAO_Notify_ProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_ProxyPushSupplier ();
+  ~TAO_Notify_ProxyPushSupplier ();
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods
+  /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
   // = Interface methods
@@ -90,4 +90,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 7a5b5d32d8d..73792685a9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -6,23 +6,23 @@
 #include "PushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_PushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_PushConsumer, "$id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "orbsvcs/CosEventCommC.h"
 #include "../Event.h"
 
-TAO_NS_PushConsumer::TAO_NS_PushConsumer (TAO_NS_ProxySupplier* proxy)
-  :TAO_NS_Consumer (proxy)
+TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
+  :TAO_Notify_Consumer (proxy)
 {
 }
 
-TAO_NS_PushConsumer::~TAO_NS_PushConsumer ()
+TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
 {
 }
 
 void
-TAO_NS_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
 {
   this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
 
@@ -39,36 +39,36 @@ TAO_NS_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_
 }
 
 void
-TAO_NS_PushConsumer::release (void)
+TAO_Notify_PushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_PushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
 {
   this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (event, any);
+  TAO_Notify_Event::translate (event, any);
 
   this->push_consumer_->push (any ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index a5fbd384a91..5361d906055 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PUSHCONSUMER_H
-#define TAO_NS_PUSHCONSUMER_H
+#ifndef TAO_Notify_PUSHCONSUMER_H
+#define TAO_Notify_PUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -23,31 +23,31 @@
 #include "../Consumer.h"
 
 /**
- * @class TAO_NS_PushConsumer
+ * @class TAO_Notify_PushConsumer
  *
  * @brief Wrapper for the PushConsumer that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_PushConsumer : public TAO_NS_Consumer
+class TAO_Notify_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_PushConsumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Destructor
-  ~TAO_NS_PushConsumer ();
+  ~TAO_Notify_PushConsumer ();
 
   /// Init
   void init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods.
+  /// TAO_Notify_Destroy_Callback methods.
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -65,4 +65,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PUSHCONSUMER_H */
+#endif /* TAO_Notify_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index fb1642a7759..ed1bcf7b2f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -6,19 +6,19 @@
 #include "PushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_PushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_PushSupplier, "$id$")
 
-TAO_NS_PushSupplier::TAO_NS_PushSupplier (TAO_NS_ProxyConsumer* proxy)
-  :TAO_NS_Supplier (proxy)
+TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy)
+  :TAO_Notify_Supplier (proxy)
 {
 }
 
-TAO_NS_PushSupplier::~TAO_NS_PushSupplier ()
+TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 {
 }
 
 void
-TAO_NS_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
 {
   this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier);
 
@@ -35,7 +35,7 @@ TAO_NS_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_
 }
 
 void
-TAO_NS_PushSupplier::release (void)
+TAO_Notify_PushSupplier::release (void)
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index be260eb1710..819fa51e51c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PUSHSUPPLIER_H
-#define TAO_NS_PUSHSUPPLIER_H
+#ifndef TAO_Notify_PUSHSUPPLIER_H
+#define TAO_Notify_PUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -23,27 +23,27 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
 /**
- * @class TAO_NS_StructuredPushSupplier
+ * @class TAO_Notify_StructuredPushSupplier
  *
  * @brief Wrapper for the PushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_PushSupplier : public TAO_NS_Supplier
+class TAO_Notify_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
-  TAO_NS_PushSupplier (TAO_NS_ProxyConsumer* proxy);
+  TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy);
 
   /// Destructor
-  ~TAO_NS_PushSupplier ();
+  ~TAO_Notify_PushSupplier ();
 
   /// Init
   void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods
+  /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
 protected:
@@ -56,4 +56,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PUSHSUPPLIER_H */
+#endif /* TAO_Notify_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index d2a5bdd3e7f..b22cc1a25e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -6,7 +6,7 @@
 #include "Buffering_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Buffering_Strategy, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Buffering_Strategy, "$Id$")
 
 #include "ace/Message_Queue.h"
 #include "orbsvcs/CosNotificationC.h"
@@ -15,7 +15,7 @@ ACE_RCSID(Notify, TAO_NS_Buffering_Strategy, "$Id$")
 #include "QoSProperties.h"
 #include "tao/debug.h"
 
-TAO_NS_Buffering_Strategy::TAO_NS_Buffering_Strategy (TAO_NS_Message_Queue& msg_queue, TAO_NS_AdminProperties_var& admin_properties, CORBA::Long batch_size)
+TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size)
   : msg_queue_ (msg_queue),
     admin_properties_ (admin_properties),
     global_queue_lock_ (admin_properties->global_queue_lock ()),
@@ -33,12 +33,12 @@ TAO_NS_Buffering_Strategy::TAO_NS_Buffering_Strategy (TAO_NS_Message_Queue& msg_
 {
 }
 
-TAO_NS_Buffering_Strategy::~TAO_NS_Buffering_Strategy ()
+TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy ()
 {
 }
 
 void
-TAO_NS_Buffering_Strategy::update_qos_properties (const TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_Buffering_Strategy::update_qos_properties (const TAO_Notify_QoSProperties& qos_properties)
 {
   this->order_policy_.set (qos_properties);
 
@@ -47,7 +47,7 @@ TAO_NS_Buffering_Strategy::update_qos_properties (const TAO_NS_QoSProperties& qo
       this->use_discarding_ = 1;
     }
 
-  TAO_NS_Property_Time blocking_timeout (TAO_Notify_Extensions::BlockingPolicy);
+  TAO_Notify_Property_Time blocking_timeout (TAO_Notify_Extensions::BlockingPolicy);
 
   if (blocking_timeout.set (qos_properties) != -1) // if set to a valid time, init the blocking_time_
     {
@@ -63,7 +63,7 @@ TAO_NS_Buffering_Strategy::update_qos_properties (const TAO_NS_QoSProperties& qo
 }
 
 void
-TAO_NS_Buffering_Strategy::shutdown (void)
+TAO_Notify_Buffering_Strategy::shutdown (void)
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
 
@@ -75,7 +75,7 @@ TAO_NS_Buffering_Strategy::shutdown (void)
 }
 
 int
-TAO_NS_Buffering_Strategy::enqueue (TAO_NS_Method_Request& method_request)
+TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request& method_request)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
@@ -161,7 +161,7 @@ TAO_NS_Buffering_Strategy::enqueue (TAO_NS_Method_Request& method_request)
 }
 
 int
-TAO_NS_Buffering_Strategy::dequeue (TAO_NS_Method_Request* &method_request, const ACE_Time_Value *abstime)
+TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request* &method_request, const ACE_Time_Value *abstime)
 {
   ACE_Message_Block *mb;
 
@@ -181,7 +181,7 @@ TAO_NS_Buffering_Strategy::dequeue (TAO_NS_Method_Request* &method_request, cons
   if (this->msg_queue_.dequeue (mb) == -1)
     return -1;
 
-  method_request = ACE_dynamic_cast (TAO_NS_Method_Request*, mb);
+  method_request = ACE_dynamic_cast (TAO_Notify_Method_Request*, mb);
 
   if (method_request == 0)
     return -1;
@@ -197,7 +197,7 @@ TAO_NS_Buffering_Strategy::dequeue (TAO_NS_Method_Request* &method_request, cons
 }
 
 int
-TAO_NS_Buffering_Strategy::queue (TAO_NS_Method_Request& method_request)
+TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request& method_request)
 {
   int result;
 
@@ -237,7 +237,7 @@ TAO_NS_Buffering_Strategy::queue (TAO_NS_Method_Request& method_request)
 }
 
 int
-TAO_NS_Buffering_Strategy::discard (void)
+TAO_Notify_Buffering_Strategy::discard (void)
 {
   ACE_Message_Block *mb;
   int result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index 7b854a47508..e235ac390f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_BUFFERING_STRATEGY_H
-#define TAO_NS_BUFFERING_STRATEGY_H
+#ifndef TAO_Notify_BUFFERING_STRATEGY_H
+#define TAO_Notify_BUFFERING_STRATEGY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -26,40 +26,40 @@
 #include "Property_T.h"
 #include "AdminProperties.h"
 
-class TAO_NS_Method_Request;
-class TAO_NS_QoSProperties;
+class TAO_Notify_Method_Request;
+class TAO_Notify_QoSProperties;
 
-typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_NS_Message_Queue;
+typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Notify_Message_Queue;
 
 /**
- * @class TAO_NS_Buffering_Strategy
+ * @class TAO_Notify_Buffering_Strategy
  *
  * @brief Base Strategy to enqueue and dequeue items from a Message Queue.
  *
  */
-class TAO_Notify_Export TAO_NS_Buffering_Strategy
+class TAO_Notify_Export TAO_Notify_Buffering_Strategy
 {
 public:
   /// Constuctor
-  TAO_NS_Buffering_Strategy (TAO_NS_Message_Queue& msg_queue, TAO_NS_AdminProperties_var& admin_properties, CORBA::Long batch_size);
+  TAO_Notify_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size);
 
   /// Destructor
-  ~TAO_NS_Buffering_Strategy ();
+  ~TAO_Notify_Buffering_Strategy ();
 
   /// Update state with the following QoS Properties:
   /// Order Policy
   /// Discard Policy
   /// MaxEventsPerConsumer
   /// TAO_Notify_Extensions::BlockingPolicy
-  void update_qos_properties (const TAO_NS_QoSProperties& qos_properties);
+  void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Enqueue according the enqueing strategy.
   /// Return -1 on error else the number of items in the queue.
-  int enqueue (TAO_NS_Method_Request& method_request);
+  int enqueue (TAO_Notify_Method_Request& method_request);
 
   /// Dequeue batch. This method will block for <abstime> if non-zero or else blocks till an item is available.
   /// Return -1 on error or if nothing is available, else the number of items actually dequeued (1).
-  int dequeue (TAO_NS_Method_Request* &method_request, const ACE_Time_Value *abstime);
+  int dequeue (TAO_Notify_Method_Request* &method_request, const ACE_Time_Value *abstime);
 
   /// Shutdown
   void shutdown (void);
@@ -75,7 +75,7 @@ public:
 
 protected:
   /// Apply the Order Policy and queue. return -1 on error.
-  int queue (TAO_NS_Method_Request& method_request);
+  int queue (TAO_Notify_Method_Request& method_request);
 
   /// Discard as per the Discard Policy.
   int discard (void);
@@ -83,10 +83,10 @@ protected:
   ///= Data Members
 
   /// The local Message Queue
-  TAO_NS_Message_Queue& msg_queue_;
+  TAO_Notify_Message_Queue& msg_queue_;
 
   /// Reference to the properties per event channel.
-  TAO_NS_AdminProperties_var admin_properties_;
+  TAO_Notify_AdminProperties_var admin_properties_;
 
   /// The shared global lock used by all the queues.
   ACE_SYNCH_MUTEX& global_queue_lock_;
@@ -98,16 +98,16 @@ protected:
   CORBA::Long& global_queue_length_;
 
   /// The maximum events that can be queued overall.
-  const TAO_NS_Property_Long& max_global_queue_length_;
+  const TAO_Notify_Property_Long& max_global_queue_length_;
 
   /// The maximum queue length for the local queue.
   CORBA::Long max_local_queue_length_;
 
   /// Order of events in internal buffers.
-  TAO_NS_Property_Short order_policy_;
+  TAO_Notify_Property_Short order_policy_;
 
   /// Policy to discard when buffers are full.
-  TAO_NS_Property_Short discard_policy_;
+  TAO_Notify_Property_Short discard_policy_;
 
   /// Flag that we should use discarding(1) or blocking (0).
   int use_discarding_;
@@ -134,4 +134,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_BUFFERING_STRATEGY_H */
+#endif /* TAO_Notify_BUFFERING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.inl b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.inl
index 3dbfa925c5b..d70f96d29ce 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.inl
@@ -1,19 +1,19 @@
 // $Id$
 
 ACE_INLINE void
-TAO_NS_Buffering_Strategy::batch_size (CORBA::Long batch_size)
+TAO_Notify_Buffering_Strategy::batch_size (CORBA::Long batch_size)
 {
   this->batch_size_ = batch_size;
 }
 
 ACE_INLINE CORBA::Long
-TAO_NS_Buffering_Strategy::batch_size (void)
+TAO_Notify_Buffering_Strategy::batch_size (void)
 {
   return this->batch_size_;
 }
 
 ACE_INLINE void
-TAO_NS_Buffering_Strategy::max_local_queue_length (CORBA::Long length)
+TAO_Notify_Buffering_Strategy::max_local_queue_length (CORBA::Long length)
 {
   this->max_local_queue_length_ = length;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 9efaf028d3f..171bd4a0f05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -5,7 +5,7 @@
 #include "Builder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_Builder, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Builder, "$Id$")
 
 #include "ace/Dynamic_Service.h"
 #include "tao/PortableServer/PortableServerC.h"
@@ -38,7 +38,7 @@ ACE_RCSID(RT_Notify, TAO_NS_Builder, "$Id$")
 #include "Container_T.h"
 
 template <class PROXY_IMPL, class PROXY, class PROXY_PTR, class PROXY_VAR, class PARENT>
-class TAO_NS_Proxy_Builder_T
+class TAO_Notify_Proxy_Builder_T
 {
 public:
   PROXY_PTR
@@ -47,7 +47,7 @@ public:
   {
     PROXY_VAR proxy_ret;
 
-    TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+    TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
     PROXY_IMPL* proxy = 0;
     factory->create (proxy ACE_ENV_ARG_PARAMETER);
@@ -78,106 +78,106 @@ public:
 };
 
 // define the ProxyConsumer Builders.
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_ProxyPushConsumer
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_ProxyPushConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyConsumer_var
-                             , TAO_NS_SupplierAdmin>
-TAO_NS_ProxyPushConsumer_Builder;
+                             , TAO_Notify_SupplierAdmin>
+TAO_Notify_ProxyPushConsumer_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_StructuredProxyPushConsumer
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_StructuredProxyPushConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyConsumer_var
-                             , TAO_NS_SupplierAdmin>
-TAO_NS_StructuredProxyPushConsumer_Builder;
+                             , TAO_Notify_SupplierAdmin>
+TAO_Notify_StructuredProxyPushConsumer_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_SequenceProxyPushConsumer
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_SequenceProxyPushConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyConsumer_var
-                             , TAO_NS_SupplierAdmin>
-TAO_NS_SequenceProxyPushConsumer_Builder;
+                             , TAO_Notify_SupplierAdmin>
+TAO_Notify_SequenceProxyPushConsumer_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_CosEC_ProxyPushConsumer
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_CosEC_ProxyPushConsumer
                              , CosEventChannelAdmin::ProxyPushConsumer
                              , CosEventChannelAdmin::ProxyPushConsumer_ptr
                              , CosEventChannelAdmin::ProxyPushConsumer_var
-                             , TAO_NS_SupplierAdmin>
-TAO_NS_CosEC_ProxyPushConsumer_Builder;
+                             , TAO_Notify_SupplierAdmin>
+TAO_Notify_CosEC_ProxyPushConsumer_Builder;
 
 // define the ProxySupplier Builders.
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_ProxyPushSupplier
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_ProxyPushSupplier
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxySupplier_var
-                             , TAO_NS_ConsumerAdmin>
-TAO_NS_ProxyPushSupplier_Builder;
+                             , TAO_Notify_ConsumerAdmin>
+TAO_Notify_ProxyPushSupplier_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_StructuredProxyPushSupplier
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_StructuredProxyPushSupplier
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxySupplier_var
-                             , TAO_NS_ConsumerAdmin>
-TAO_NS_StructuredProxyPushSupplier_Builder;
+                             , TAO_Notify_ConsumerAdmin>
+TAO_Notify_StructuredProxyPushSupplier_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_SequenceProxyPushSupplier
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_SequenceProxyPushSupplier
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxySupplier_var
-                             , TAO_NS_ConsumerAdmin>
-TAO_NS_SequenceProxyPushSupplier_Builder;
+                             , TAO_Notify_ConsumerAdmin>
+TAO_Notify_SequenceProxyPushSupplier_Builder;
 
-typedef TAO_NS_Proxy_Builder_T<TAO_NS_CosEC_ProxyPushSupplier
+typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_CosEC_ProxyPushSupplier
                              , CosEventChannelAdmin::ProxyPushSupplier
                              , CosEventChannelAdmin::ProxyPushSupplier_ptr
                              , CosEventChannelAdmin::ProxyPushSupplier_var
-                             , TAO_NS_ConsumerAdmin>
-TAO_NS_CosEC_ProxyPushSupplier_Builder;
+                             , TAO_Notify_ConsumerAdmin>
+TAO_Notify_CosEC_ProxyPushSupplier_Builder;
 
-TAO_NS_Builder::TAO_NS_Builder (void)
+TAO_Notify_Builder::TAO_Notify_Builder (void)
 {
   // Init the static members.
-  TAO_NS_AnyEvent::event_type_ = TAO_NS_EventType::special ();
+  TAO_Notify_AnyEvent::event_type_ = TAO_Notify_EventType::special ();
 }
 
-TAO_NS_Builder::~TAO_NS_Builder ()
+TAO_Notify_Builder::~TAO_Notify_Builder ()
 {
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NS_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_FilterFactory* ff = ACE_Dynamic_Service<TAO_NS_FilterFactory>::instance ("TAO_NS_FilterFactory");
+  TAO_Notify_FilterFactory* ff = ACE_Dynamic_Service<TAO_Notify_FilterFactory>::instance ("TAO_Notify_FilterFactory");
 
   if (ff == 0)
     {
       ACE_NEW_THROW_EX (ff,
-                        TAO_NS_ETCL_FilterFactory (),
+                        TAO_Notify_ETCL_FilterFactory (),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
     }
 
-  PortableServer::POA_var default_poa = TAO_NS_PROPERTIES::instance ()->default_poa ();
+  PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
   return ff->create (default_poa ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NS_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf_ret;
 
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   // Create ECF
-  TAO_NS_EventChannelFactory* ecf = 0;
+  TAO_Notify_EventChannelFactory* ecf = 0;
   factory->create (ecf ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ecf_ret._retn ());
 
   PortableServer::ServantBase_var servant_var (ecf);
 
-  ecf->TAO_NS_EventChannelFactory::init (poa ACE_ENV_ARG_PARAMETER);
+  ecf->TAO_Notify_EventChannelFactory::init (poa ACE_ENV_ARG_PARAMETER);
 
   CORBA::Object_var obj = ecf->activate (ecf ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ecf_ret._retn ());
@@ -189,13 +189,13 @@ TAO_NS_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NS_Builder::build_event_channel (TAO_NS_EventChannelFactory* ecf, const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_event_channel (TAO_Notify_EventChannelFactory* ecf, const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec_ret;
 
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
-  TAO_NS_EventChannel* ec = 0;
+  TAO_Notify_EventChannel* ec = 0;
   factory->create (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ec_ret._retn ());
 
@@ -221,13 +221,13 @@ TAO_NS_Builder::build_event_channel (TAO_NS_EventChannelFactory* ecf, const CosN
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_Builder::build_consumer_admin (TAO_NS_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_consumer_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ca_ret;
 
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
-  TAO_NS_ConsumerAdmin* ca = 0;
+  TAO_Notify_ConsumerAdmin* ca = 0;
   factory->create (ca ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ca_ret._retn ());
 
@@ -254,13 +254,13 @@ TAO_NS_Builder::build_consumer_admin (TAO_NS_EventChannel* ec, CosNotifyChannelA
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NS_Builder::build_supplier_admin (TAO_NS_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var sa_ret;
 
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
-  TAO_NS_SupplierAdmin* sa = 0;
+  TAO_Notify_SupplierAdmin* sa = 0;
   factory->create (sa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (sa_ret._retn ());
 
@@ -287,7 +287,7 @@ TAO_NS_Builder::build_supplier_admin (TAO_NS_EventChannel* ec, CosNotifyChannelA
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_NS_Builder::build_proxy(TAO_NS_SupplierAdmin* sa
+TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
                             , const CosNotification::QoSProperties & initial_qos
@@ -297,21 +297,21 @@ TAO_NS_Builder::build_proxy(TAO_NS_SupplierAdmin* sa
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        TAO_NS_ProxyPushConsumer_Builder pb;
+        TAO_Notify_ProxyPushConsumer_Builder pb;
         return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
       }
     break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
-        TAO_NS_StructuredProxyPushConsumer_Builder pb;
+        TAO_Notify_StructuredProxyPushConsumer_Builder pb;
         return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
      {
-       TAO_NS_SequenceProxyPushConsumer_Builder pb;
+       TAO_Notify_SequenceProxyPushConsumer_Builder pb;
        return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
      }
       break;
@@ -323,7 +323,7 @@ TAO_NS_Builder::build_proxy(TAO_NS_SupplierAdmin* sa
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_NS_Builder::build_proxy(TAO_NS_ConsumerAdmin* ca
+TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
                             , const CosNotification::QoSProperties & initial_qos
@@ -333,21 +333,21 @@ TAO_NS_Builder::build_proxy(TAO_NS_ConsumerAdmin* ca
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        TAO_NS_ProxyPushSupplier_Builder pb;
+        TAO_Notify_ProxyPushSupplier_Builder pb;
         return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
-        TAO_NS_StructuredProxyPushSupplier_Builder pb;
+        TAO_Notify_StructuredProxyPushSupplier_Builder pb;
         return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
-        TAO_NS_SequenceProxyPushSupplier_Builder pb;
+        TAO_Notify_SequenceProxyPushSupplier_Builder pb;
         return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
       }
       break;
@@ -359,11 +359,11 @@ TAO_NS_Builder::build_proxy(TAO_NS_ConsumerAdmin* ca
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_NS_Builder::build_proxy (TAO_NS_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
-  TAO_NS_CosEC_ProxyPushSupplier_Builder pb;
+  TAO_Notify_CosEC_ProxyPushSupplier_Builder pb;
 
   CosNotification::QoSProperties initial_qos;
 
@@ -371,11 +371,11 @@ TAO_NS_Builder::build_proxy (TAO_NS_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_NS_Builder::build_proxy (TAO_NS_SupplierAdmin* sa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
-  TAO_NS_CosEC_ProxyPushConsumer_Builder pb;
+  TAO_Notify_CosEC_ProxyPushConsumer_Builder pb;
 
   CosNotification::QoSProperties initial_qos;
 
@@ -383,12 +383,12 @@ TAO_NS_Builder::build_proxy (TAO_NS_SupplierAdmin* sa ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_Builder::apply_reactive_concurrency (TAO_NS_Object& object ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Reactive_Task* worker_task;
+  TAO_Notify_Reactive_Task* worker_task;
 
   ACE_NEW_THROW_EX (worker_task,
-                    TAO_NS_Reactive_Task (),
+                    TAO_Notify_Reactive_Task (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -401,12 +401,12 @@ TAO_NS_Builder::apply_reactive_concurrency (TAO_NS_Object& object ACE_ENV_ARG_DE
 }
 
 void
-TAO_NS_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
 {
-  TAO_NS_ThreadPool_Task* worker_task;
+  TAO_Notify_ThreadPool_Task* worker_task;
 
   ACE_NEW_THROW_EX (worker_task,
-                    TAO_NS_ThreadPool_Task (),
+                    TAO_Notify_ThreadPool_Task (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -419,7 +419,7 @@ TAO_NS_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object, const Noti
 }
 
 void
-TAO_NS_Builder::apply_lane_concurrency (TAO_NS_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/ ACE_ENV_ARG_DECL)
 {
   // No lane support
   ACE_THROW (CORBA::NO_IMPLEMENT ());
@@ -427,10 +427,10 @@ TAO_NS_Builder::apply_lane_concurrency (TAO_NS_Object& /*object*/, const NotifyE
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Dynamic_Service<TAO_NS_FilterFactory>;
+template class ACE_Dynamic_Service<TAO_Notify_FilterFactory>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Dynamic_Service<TAO_NS_FilterFactory>
+#pragma instantiate ACE_Dynamic_Service<TAO_Notify_FilterFactory>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index cf668dc885f..7698c31ab2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_BUILDER_H
-#define TAO_NS_BUILDER_H
+#ifndef TAO_Notify_BUILDER_H
+#define TAO_Notify_BUILDER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,25 +24,25 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "AdminProperties.h"
 
-class TAO_NS_EventChannelFactory;
-class TAO_NS_EventChannel;
-class TAO_NS_SupplierAdmin;
-class TAO_NS_ConsumerAdmin;
-class TAO_NS_FilterFactory;
-class TAO_NS_Object;
+class TAO_Notify_EventChannelFactory;
+class TAO_Notify_EventChannel;
+class TAO_Notify_SupplierAdmin;
+class TAO_Notify_ConsumerAdmin;
+class TAO_Notify_FilterFactory;
+class TAO_Notify_Object;
 
 /**
- * @class TAO_NS_Builder
+ * @class TAO_Notify_Builder
  *
  * @brief Helper class to create and activate CORBA objects.
  *
  */
-class TAO_Notify_Export TAO_NS_Builder
+class TAO_Notify_Export TAO_Notify_Builder
 {
 public:
-  TAO_NS_Builder (void);
+  TAO_Notify_Builder (void);
 
-  virtual ~TAO_NS_Builder ();
+  virtual ~TAO_Notify_Builder ();
 
   ///= Factory Methods
 
@@ -55,7 +55,7 @@ public:
 
   /// Build EventChannel.
   virtual CosNotifyChannelAdmin::EventChannel_ptr
-  build_event_channel (TAO_NS_EventChannelFactory* ecf
+  build_event_channel (TAO_Notify_EventChannelFactory* ecf
                        , const CosNotification::QoSProperties & initial_qos
                        , const CosNotification::AdminProperties & initial_admin
                        , CosNotifyChannelAdmin::ChannelID_out id
@@ -63,21 +63,21 @@ public:
 
   /// Build ConsumerAdmin
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  build_consumer_admin (TAO_NS_EventChannel* ec
+  build_consumer_admin (TAO_Notify_EventChannel* ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
                         , CosNotifyChannelAdmin::AdminID_out id
                         ACE_ENV_ARG_DECL);
 
   /// Build SupplierAdmin
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr
-  build_supplier_admin (TAO_NS_EventChannel* ec
+  build_supplier_admin (TAO_Notify_EventChannel* ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
                         , CosNotifyChannelAdmin::AdminID_out id
                         ACE_ENV_ARG_DECL);
 
   /// Build ProxyConsumer
   virtual CosNotifyChannelAdmin::ProxyConsumer_ptr
-  build_proxy (TAO_NS_SupplierAdmin* sa
+  build_proxy (TAO_Notify_SupplierAdmin* sa
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
                , const CosNotification::QoSProperties & initial_qos
@@ -85,7 +85,7 @@ public:
 
   /// Build ProxySupplier.
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
-  build_proxy (TAO_NS_ConsumerAdmin* ca
+  build_proxy (TAO_Notify_ConsumerAdmin* ca
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
                , const CosNotification::QoSProperties & initial_qos
@@ -93,20 +93,20 @@ public:
 
   /// Build CosEC style ProxySupplier.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-  build_proxy (TAO_NS_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
 
   /// Build CosEC style ProxyConsumer.
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-  build_proxy (TAO_NS_SupplierAdmin* sa ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL);
 
   /// Apply Reactive concurrency.
-  virtual void apply_reactive_concurrency (TAO_NS_Object& object ACE_ENV_ARG_DECL);
+  virtual void apply_reactive_concurrency (TAO_Notify_Object& object ACE_ENV_ARG_DECL);
 
   /// Apply Thread Pools.
-  virtual void apply_thread_pool_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
 
   /// Apply Thread Pools with Lanes.
-  virtual void apply_lane_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
@@ -114,4 +114,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_BUILDER_H */
+#endif /* TAO_Notify_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index f5b1f5318d0..84506c169de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -6,36 +6,36 @@
 #include "Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_Consumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Consumer, "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "ace/Unbounded_Queue.h"
 #include "tao/debug.h"
 
-TAO_NS_Consumer::TAO_NS_Consumer (TAO_NS_ProxySupplier* proxy)
+TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy)
   :proxy_ (proxy), event_collection_ (0), is_suspended_ (0)
 {
-  this->event_collection_ = new TAO_NS_Event_Collection ();
+  this->event_collection_ = new TAO_Notify_Event_Collection ();
 }
 
-TAO_NS_Consumer::~TAO_NS_Consumer ()
+TAO_Notify_Consumer::~TAO_Notify_Consumer ()
 {
   delete this->event_collection_;
 }
 
-TAO_NS_Proxy*
-TAO_NS_Consumer::proxy (void)
+TAO_Notify_Proxy*
+TAO_Notify_Consumer::proxy (void)
 {
   return this->proxy_supplier ();
 }
 
 void
-TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->is_suspended_ == 1)
     return; // Do nothing if we're suspended.
 
-  TAO_NS_Event_Collection event_collection_copy;
+  TAO_Notify_Event_Collection event_collection_copy;
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
@@ -43,9 +43,9 @@ TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
     this->event_collection_->reset ();
   }
 
-  TAO_NS_ProxySupplier* proxy_supplier = this->proxy_supplier ();
+  TAO_Notify_ProxySupplier* proxy_supplier = this->proxy_supplier ();
 
-  TAO_NS_Event_var event;
+  TAO_Notify_Event_var event;
 
   while (!event_collection_copy.is_empty ())
     {
@@ -57,7 +57,7 @@ TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->is_suspended_ = 0;
 
@@ -65,7 +65,7 @@ TAO_NS_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
+TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
                                      ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (this->publish_.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index f0d3ec1a54f..574865e5ba5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_H
-#define TAO_NS_CONSUMER_H
+#ifndef TAO_Notify_CONSUMER_H
+#define TAO_Notify_CONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,35 +24,35 @@
 #include "Peer.h"
 #include "Event.h"
 
-class TAO_NS_ProxySupplier;
-class TAO_NS_Proxy;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_Proxy;
 
 /**
- * @class TAO_NS_Consumer
+ * @class TAO_Notify_Consumer
  *
  * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel
  *
  */
-class TAO_Notify_Export TAO_NS_Consumer : public TAO_NS_Peer
+class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer
 {
 public:
   /// Constuctor
-  TAO_NS_Consumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Destructor
-  virtual ~TAO_NS_Consumer ();
+  virtual ~TAO_Notify_Consumer ();
 
   /// Access Specific Proxy.
-  TAO_NS_ProxySupplier* proxy_supplier (void);
+  TAO_Notify_ProxySupplier* proxy_supplier (void);
 
   /// Access Base Proxy.
-  virtual TAO_NS_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy (void);
 
   /// Push <event> to this consumer.
-  void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
-  void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL) = 0;
@@ -79,19 +79,19 @@ protected:
                                    ACE_ENV_ARG_DECL);
 
   /// Push Implementation.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL) = 0;
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) = 0;
 
   /// Push Implementation.
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL) = 0;
 
   /// Get the shared Proxy Lock
   TAO_SYNCH_MUTEX* proxy_lock (void);
 
   /// The Proxy that we associate with.
-  TAO_NS_ProxySupplier* proxy_;
+  TAO_Notify_ProxySupplier* proxy_;
 
   /// Events pending to be delivered.
-  TAO_NS_Event_Collection* event_collection_;
+  TAO_Notify_Event_Collection* event_collection_;
 
   /// Suspended Flag.
   CORBA::Boolean is_suspended_;
@@ -105,4 +105,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_H */
+#endif /* TAO_Notify_CONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index 9c5c391e6f9..77a5f12c554 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -3,31 +3,31 @@
 #include "ProxySupplier.h"
 
 ACE_INLINE TAO_SYNCH_MUTEX*
-TAO_NS_Consumer::proxy_lock (void)
+TAO_Notify_Consumer::proxy_lock (void)
 {
   return &this->proxy_->lock_;
 }
 
-ACE_INLINE TAO_NS_ProxySupplier*
-TAO_NS_Consumer::proxy_supplier (void)
+ACE_INLINE TAO_Notify_ProxySupplier*
+TAO_Notify_Consumer::proxy_supplier (void)
 {
   return this->proxy_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Consumer::is_suspended (void)
+TAO_Notify_Consumer::is_suspended (void)
 {
   return this->is_suspended_;
 }
 
 ACE_INLINE void
-TAO_NS_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->is_suspended_ = 1;
 }
 
 ACE_INLINE void
-TAO_NS_Consumer::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
   if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
     {
@@ -60,14 +60,14 @@ TAO_NS_Consumer::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
 }
 
 ACE_INLINE void
-TAO_NS_Consumer::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
 
-      TAO_NS_Event* event_copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      TAO_NS_Event_Copy_var event_var (event_copy);
+      TAO_Notify_Event* event_copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      TAO_Notify_Event_Copy_var event_var (event_copy);
 
       this->event_collection_->enqueue_head (event_var);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index bc1a36fc936..842fb2ea5ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -6,7 +6,7 @@
 #include "ConsumerAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_ConsumerAdmin, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_ConsumerAdmin, "$Id$")
 
 #include "ace/Auto_Ptr.h"
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
@@ -19,55 +19,55 @@ ACE_RCSID(RT_Notify, TAO_NS_ConsumerAdmin, "$Id$")
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
 
-typedef TAO_NS_Find_Worker_T<TAO_NS_Proxy
+typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>
-TAO_NS_ProxySupplier_Find_Worker;
+TAO_Notify_ProxySupplier_Find_Worker;
 
-typedef TAO_NS_Seq_Worker_T<TAO_NS_Proxy> TAO_NS_Proxy_Seq_Worker;
+typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
-TAO_NS_ConsumerAdmin::TAO_NS_ConsumerAdmin (void)
+TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin (void)
 {
 }
 
-TAO_NS_ConsumerAdmin::~TAO_NS_ConsumerAdmin ()
+TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin ()
 {
 }
 
 void
-TAO_NS_ConsumerAdmin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Admin::init (ec ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
 
   const CosNotification::QoSProperties &default_ca_qos =
-    TAO_NS_PROPERTIES::instance ()->default_consumer_admin_qos_properties ();
+    TAO_Notify_PROPERTIES::instance ()->default_consumer_admin_qos_properties ();
 
   this->set_qos (default_ca_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_NS_ConsumerAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_NS_ConsumerAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_NS_ConsumerAdmin::release (void)
+TAO_Notify_ConsumerAdmin::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -82,7 +82,7 @@ TAO_NS_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_NS_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
+TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                                          CosNotifyChannelAdmin::ProxyID_out proxy_id
                                                          ACE_ENV_ARG_DECL
                                                          )
@@ -93,7 +93,7 @@ TAO_NS_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::
 {
   CosNotification::QoSProperties initial_qos;
 
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
                                                                                                                                                                 , initial_qos
@@ -101,7 +101,7 @@ TAO_NS_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_NS_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
+TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
                                                                   ACE_ENV_ARG_DECL
@@ -112,7 +112,7 @@ TAO_NS_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChann
                      , CosNotification::UnsupportedQoS
                      ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
                                                                 , initial_qos
@@ -120,16 +120,16 @@ TAO_NS_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChann
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_NS_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_NS_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -138,7 +138,7 @@ TAO_NS_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NS_ConsumerAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -147,7 +147,7 @@ TAO_NS_ConsumerAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NS_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -156,49 +156,49 @@ TAO_NS_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NS_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_Proxy_Seq_Worker seq_worker;
+  TAO_Notify_Proxy_Seq_Worker seq_worker;
 
   return seq_worker.create (*this->proxy_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_NS_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
                    ))
 {
-  TAO_NS_ProxySupplier_Find_Worker find_worker;
+  TAO_Notify_ProxySupplier_Find_Worker find_worker;
 
   return find_worker.resolve (proxy_id, *this->proxy_container_ ACE_ENV_ARG_PARAMETER);
 }
 
-void TAO_NS_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_NS_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 
 CosNotification::QoSProperties*
-TAO_NS_ConsumerAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added,
+TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added,
                                            const CosNotification::EventTypeSeq & removed
                                            ACE_ENV_ARG_DECL
                                            )
@@ -207,8 +207,8 @@ TAO_NS_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq &
                    , CosNotifyComm::InvalidEventType
                    ))
 {
-  TAO_NS_EventTypeSeq seq_added (added);
-  TAO_NS_EventTypeSeq seq_removed (removed);
+  TAO_Notify_EventTypeSeq seq_added (added);
+  TAO_Notify_EventTypeSeq seq_removed (removed);
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -217,14 +217,14 @@ TAO_NS_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq &
 
     this->subscribed_types_.init (seq_added, seq_removed);
 
-    TAO_NS_Subscription_Change_Worker worker (added, removed);
+    TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
     this->proxy_container_->collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
   }
 }
 
 CosNotifyFilter::FilterID
-TAO_NS_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -233,7 +233,7 @@ TAO_NS_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV
 }
 
 void
-TAO_NS_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
@@ -243,7 +243,7 @@ TAO_NS_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_AR
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_NS_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
@@ -253,7 +253,7 @@ TAO_NS_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_D
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_NS_ConsumerAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -262,7 +262,7 @@ TAO_NS_ConsumerAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -273,7 +273,7 @@ TAO_NS_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 /************ UNIMPLMENTED METHODS *************************/
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NS_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -282,7 +282,7 @@ TAO_NS_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -292,7 +292,7 @@ TAO_NS_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*prio
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NS_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -302,7 +302,7 @@ TAO_NS_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -311,7 +311,7 @@ TAO_NS_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*life
 }
 
 ::CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NS_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -320,7 +320,7 @@ TAO_NS_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_NS_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/,
+TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/,
                                                          CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -333,7 +333,7 @@ TAO_NS_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::
 }
 
 void
-TAO_NS_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
+TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
                                     ACE_ENV_ARG_DECL
                                     )
@@ -346,7 +346,7 @@ TAO_NS_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*req
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_NS_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -356,14 +356,14 @@ TAO_NS_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Find_Worker_T<TAO_NS_Proxy
+template class TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Find_Worker_T<TAO_NS_Proxy
+#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
                              , CosNotifyChannelAdmin::ProxySupplier_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 82dde1c4304..ef8efa677b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMERADMIN_H
-#define TAO_NS_CONSUMERADMIN_H
+#ifndef TAO_Notify_CONSUMERADMIN_H
+#define TAO_Notify_CONSUMERADMIN_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -30,23 +30,23 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_ConsumerAdmin
+ * @class TAO_Notify_ConsumerAdmin
  *
  * @brief Implementation of CosNotifyChannelAdmin::ConsumerAdmin
  *
  */
-class TAO_Notify_Export TAO_NS_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin
-                                             , public virtual TAO_NS_Admin
+class TAO_Notify_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin
+                                             , public virtual TAO_Notify_Admin
 {
 public:
   /// Constuctor
-  TAO_NS_ConsumerAdmin (void);
+  TAO_Notify_ConsumerAdmin (void);
 
   /// Destructor
-  ~TAO_NS_ConsumerAdmin ();
+  ~TAO_Notify_ConsumerAdmin ();
 
   /// Init
-  void init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
@@ -227,4 +227,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMERADMIN_H */
+#endif /* TAO_Notify_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
index ca248f949a4..d85f561f71d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_MAP_H
-#define TAO_NS_CONSUMER_MAP_H
+#ifndef TAO_Notify_CONSUMER_MAP_H
+#define TAO_Notify_CONSUMER_MAP_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,13 +24,13 @@
 #include "ProxySupplier.h"
 
 /**
- * @class TAO_NS_Consumer_Map
+ * @class TAO_Notify_Consumer_Map
  *
  * @brief The Event Map for Consumers.
  *
  */
 
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_NS_Consumer_Map;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map;
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_MAP_H */
+#endif /* TAO_Notify_CONSUMER_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 7cddc56764d..b2a123a5452 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_CONTAINER_T_CPP
-#define TAO_NS_CONTAINER_T_CPP
+#ifndef TAO_Notify_CONTAINER_T_CPP
+#define TAO_Notify_CONTAINER_T_CPP
 
 #include "Container_T.h"
 
@@ -15,22 +15,22 @@
 #include "Container_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Container_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Container_T, "$Id$")
 
 template<class TYPE>
-TAO_NS_Container_T<TYPE>::TAO_NS_Container_T (void)
+TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void)
   : collection_ (0)
 {
 }
 
 template<class TYPE>
-TAO_NS_Container_T<TYPE>::~TAO_NS_Container_T ()
+TAO_Notify_Container_T<TYPE>::~TAO_Notify_Container_T ()
 {
   delete collection_;
 }
 
 template <class TYPE> void
-TAO_NS_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
@@ -38,25 +38,25 @@ TAO_NS_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template<class TYPE> void
-TAO_NS_Container_T<TYPE>::insert (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::insert (TYPE* type ACE_ENV_ARG_DECL)
 {
   this->collection_->connected (type ACE_ENV_ARG_PARAMETER);
 }
 
 template<class TYPE> void
-TAO_NS_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
 {
   this->collection_->disconnected (type ACE_ENV_ARG_PARAMETER);
 }
 
 template<class TYPE> void
-TAO_NS_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // get the factory
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   // Init variables
   factory->create (this->collection_ ACE_ENV_ARG_PARAMETER);
 }
 
-#endif /* TAO_NS_CONTAINER_T_CPP */
+#endif /* TAO_Notify_CONTAINER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 003bcf55a7d..7398665bc57 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONTAINER_T_H
-#define TAO_NS_CONTAINER_T_H
+#ifndef TAO_Notify_CONTAINER_T_H
+#define TAO_Notify_CONTAINER_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,23 +22,23 @@
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 /**
- * @class TAO_NS_Container_T
+ * @class TAO_Notify_Container_T
  *
  * @brief A template class that manages a collection.
  * TYPE = type of collection
  *
  */
 template <class TYPE>
-class TAO_Notify_Export TAO_NS_Container_T
+class TAO_Notify_Export TAO_Notify_Container_T
 {
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
  public:
 
   /// Constuctor
-  TAO_NS_Container_T (void);
+  TAO_Notify_Container_T (void);
 
   /// Destructor
-  virtual ~TAO_NS_Container_T ();
+  virtual ~TAO_Notify_Container_T ();
 
   /// Init this object.
   void init (ACE_ENV_SINGLE_ARG_DECL);
@@ -73,4 +73,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONTAINER_T_H */
+#endif /* TAO_Notify_CONTAINER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
index 8d692d555bc..d37030ab59d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -1,7 +1,7 @@
 // $Id$
 
-template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_NS_Container_T<TYPE>::COLLECTION*
-TAO_NS_Container_T<TYPE>:: collection (void)
+template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_Notify_Container_T<TYPE>::COLLECTION*
+TAO_Notify_Container_T<TYPE>:: collection (void)
 {
   return this->collection_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 2195dd652ae..1479e18e46d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -2,11 +2,11 @@
 
 #include "CosNotify_Initializer.h"
 
-ACE_RCSID(Notify, TAO_NS_CosNotify_Initializer, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$")
 
 #include "CosNotify_Service.h"
 
-TAO_NS_CosNotify_Initializer::TAO_NS_CosNotify_Initializer (void)
+TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void)
 {
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
index a2e73f4898a..d7b490891c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COSNOTIFY_INITIALIZER_H
-#define TAO_NS_COSNOTIFY_INITIALIZER_H
+#ifndef TAO_Notify_COSNOTIFY_INITIALIZER_H
+#define TAO_Notify_COSNOTIFY_INITIALIZER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -20,19 +20,19 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
- * @class TAO_NS_CosNotify_Initializer
+ * @class TAO_Notify_CosNotify_Initializer
  *
  * @brief  Helper to load the Cos Notification service into the service conf. for static links.
  *
  */
-class TAO_Notify_Export TAO_NS_CosNotify_Initializer
+class TAO_Notify_Export TAO_Notify_CosNotify_Initializer
 {
 public:
   /// Constuctor
-  TAO_NS_CosNotify_Initializer (void);
+  TAO_Notify_CosNotify_Initializer (void);
 };
 
-static TAO_NS_CosNotify_Initializer TAO_NS_CosNotify_initializer;
+static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer;
 
 #include "ace/post.h"
-#endif /* TAO_NS_COSNOTIFY_INITIALIZER_H */
+#endif /* TAO_Notify_COSNOTIFY_INITIALIZER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 9c04880fc63..b47f0329c09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -41,7 +41,7 @@ TAO_CosNotify_Service::init (int argc, char *argv[])
 
   int task_per_proxy = 0;
 
-  TAO_NS_Properties *properties = TAO_NS_PROPERTIES::instance();
+  TAO_Notify_Properties *properties = TAO_Notify_PROPERTIES::instance();
 
   while (arg_shifter.is_anything_left ())
     {
@@ -183,7 +183,7 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   ACE_CHECK;
 
   /// Set the properties
-    TAO_NS_Properties* properties = TAO_NS_PROPERTIES::instance();
+    TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
 
     properties->orb (orb);
     properties->default_poa (default_poa.in ());
@@ -199,26 +199,26 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 void
 TAO_CosNotify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->factory_ = ACE_Dynamic_Service<TAO_NS_Factory>::instance ("TAO_NS_Factory");
+  this->factory_ = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
 
   if (this->factory_ == 0)
     ACE_NEW_THROW_EX (this->factory_,
-                      TAO_NS_Default_Factory (),
+                      TAO_Notify_Default_Factory (),
                       CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  TAO_NS_PROPERTIES::instance()->factory (this->factory_);
+  TAO_Notify_PROPERTIES::instance()->factory (this->factory_);
 }
 
 void
 TAO_CosNotify_Service::init_builder (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->builder_,
-                    TAO_NS_Builder (),
+                    TAO_Notify_Builder (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  TAO_NS_PROPERTIES::instance()->builder (this->builder_);
+  TAO_Notify_PROPERTIES::instance()->builder (this->builder_);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
@@ -228,7 +228,7 @@ TAO_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_CosNotify_Service::remove (TAO_NS_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
 {
   // NOP.
 }
@@ -245,7 +245,7 @@ ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_EMO_Factory_OLD,
 /*********************************************************************************************************************/
 
 ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service,
-                       ACE_TEXT (TAO_NS_COS_NOTIFICATION_SERVICE_NAME),
+                       ACE_TEXT (TAO_COS_NOTIFICATION_SERVICE_NAME),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_CosNotify_Service),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
@@ -258,10 +258,10 @@ ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Dynamic_Service<TAO_NS_Factory>;
+template class ACE_Dynamic_Service<TAO_Notify_Factory>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Dynamic_Service<TAO_NS_Factory>
+#pragma instantiate ACE_Dynamic_Service<TAO_Notify_Factory>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 6a00ade8b66..75f9b97c1ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COSNOTIFY_SERVICE_H
-#define TAO_NS_COSNOTIFY_SERVICE_H
+#ifndef TAO_Notify_COSNOTIFY_SERVICE_H
+#define TAO_Notify_COSNOTIFY_SERVICE_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -21,10 +21,10 @@
 
 #include "Service.h"
 
-class TAO_NS_Factory;
-class TAO_NS_Builder;
-class TAO_NS_Properties;
-class TAO_NS_EventChannelFactory;
+class TAO_Notify_Factory;
+class TAO_Notify_Builder;
+class TAO_Notify_Properties;
+class TAO_Notify_EventChannelFactory;
 
 /**
  * @class TAO_CosNotify_Service
@@ -52,7 +52,7 @@ public:
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
 
   /// Called by the factory when it is destroyed.
-  virtual void remove (TAO_NS_EventChannelFactory* ecf ACE_ENV_ARG_DECL);
+  virtual void remove (TAO_Notify_EventChannelFactory* ecf ACE_ENV_ARG_DECL);
 
 protected:
   /// Init the data members
@@ -68,10 +68,10 @@ protected:
   void set_threads (CosNotification::QoSProperties &qos, int threads);
 
   /// Service component for object factory operations.
-  TAO_NS_Factory* factory_;
+  TAO_Notify_Factory* factory_;
 
   /// Service component for building NS participants.
-  TAO_NS_Builder* builder_;
+  TAO_Notify_Builder* builder_;
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service)
@@ -84,4 +84,4 @@ ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD)
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_COSNOTIFY_SERVICE_H */
+#endif /* TAO_Notify_COSNOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 4bb103ddd7d..3fb6d39a784 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -6,7 +6,7 @@
 #include "Default_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Default_Factory, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Default_Factory, "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Copy_On_Write.h"
@@ -43,374 +43,374 @@ public:
   }
 };
 
-TAO_NS_Default_Factory::TAO_NS_Default_Factory (void)
+TAO_Notify_Default_Factory::TAO_Notify_Default_Factory (void)
 {
 }
 
-TAO_NS_Default_Factory::~TAO_NS_Default_Factory ()
+TAO_Notify_Default_Factory::~TAO_Notify_Default_Factory ()
 {
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ProxySupplier_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxySupplier_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_ProxySupplier> f;
+  COW_Collection_Default_Factory<TAO_Notify_ProxySupplier> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ProxyConsumer_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyConsumer_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_ProxyConsumer> f;
+  COW_Collection_Default_Factory<TAO_Notify_ProxyConsumer> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_EventChannel_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_EventChannel> f;
+  COW_Collection_Default_Factory<TAO_Notify_EventChannel> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ConsumerAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_ConsumerAdmin> f;
+  COW_Collection_Default_Factory<TAO_Notify_ConsumerAdmin> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_SupplierAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_SupplierAdmin> f;
+  COW_Collection_Default_Factory<TAO_Notify_SupplierAdmin> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_Proxy_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_Proxy_Collection* &collection ACE_ENV_ARG_DECL)
 {
-  COW_Collection_Default_Factory<TAO_NS_Proxy> f;
+  COW_Collection_Default_Factory<TAO_Notify_Proxy> f;
   f.create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_EventChannelFactory*& factory ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (factory,
-                    TAO_NS_EventChannelFactory (),
+                    TAO_Notify_EventChannelFactory (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (channel,
-                    TAO_NS_EventChannel (),
+                    TAO_Notify_EventChannel (),
                     CORBA::NO_MEMORY ());
 }
 
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (admin,
-                    TAO_NS_SupplierAdmin (),
+                    TAO_Notify_SupplierAdmin (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (admin,
-                    TAO_NS_ConsumerAdmin (),
+                    TAO_Notify_ConsumerAdmin (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_StructuredProxyPushConsumer (),
+                    TAO_Notify_StructuredProxyPushConsumer (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_StructuredProxyPushSupplier (),
+                    TAO_Notify_StructuredProxyPushSupplier (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_ProxyPushConsumer (),
+                    TAO_Notify_ProxyPushConsumer (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_ProxyPushSupplier (),
+                    TAO_Notify_ProxyPushSupplier (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_CosEC_ProxyPushConsumer (),
+                    TAO_Notify_CosEC_ProxyPushConsumer (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_CosEC_ProxyPushSupplier (),
+                    TAO_Notify_CosEC_ProxyPushSupplier (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_SequenceProxyPushConsumer (),
+                    TAO_Notify_SequenceProxyPushConsumer (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Default_Factory::create (TAO_NS_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_SequenceProxyPushSupplier (),
+                    TAO_Notify_SequenceProxyPushSupplier (),
                     CORBA::NO_MEMORY ());
 }
 
-ACE_FACTORY_DEFINE (TAO_Notify, TAO_NS_Default_Factory)
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Factory)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>;
-template class TAO_NS_Proxy_T <POA_Event_Forwarder::StructuredProxyPushSupplier>;
-template class TAO_NS_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
-template class TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
-template class TAO_NS_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>;
-template class TAO_NS_Proxy_T <POA_Event_Forwarder::ProxyPushSupplier>;
-template class TAO_NS_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>;
-template class TAO_NS_Proxy_T <POA_CosEventChannelAdmin::ProxyPushSupplier>;
-
-template class TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
-template class TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
-template class TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
-template class TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
-template class TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
-template class TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
-template class TAO_NS_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>;
-template class TAO_NS_Proxy_T <POA_CosEventChannelAdmin::ProxyPushConsumer>;
-
-template class TAO_ESF_Proxy_Collection<TAO_NS_ProxyConsumer>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_ProxySupplier>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_EventChannel>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_ConsumerAdmin>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_SupplierAdmin>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_Proxy>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_Consumer>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_Supplier>;
-template class TAO_ESF_Proxy_Collection<TAO_NS_Peer>;
+template class TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>;
+template class TAO_Notify_Proxy_T <POA_Event_Forwarder::StructuredProxyPushSupplier>;
+template class TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
+template class TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
+template class TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>;
+template class TAO_Notify_Proxy_T <POA_Event_Forwarder::ProxyPushSupplier>;
+template class TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>;
+template class TAO_Notify_Proxy_T <POA_CosEventChannelAdmin::ProxyPushSupplier>;
+
+template class TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
+template class TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
+template class TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
+template class TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
+template class TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
+template class TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
+template class TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>;
+template class TAO_Notify_Proxy_T <POA_CosEventChannelAdmin::ProxyPushConsumer>;
+
+template class TAO_ESF_Proxy_Collection<TAO_Notify_ProxyConsumer>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_ProxySupplier>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_EventChannel>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_ConsumerAdmin>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_SupplierAdmin>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_Proxy>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_Consumer>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_Supplier>;
+template class TAO_ESF_Proxy_Collection<TAO_Notify_Peer>;
 
 template class ACE_Unbounded_Set<int>;
-//template class ACE_Unbounded_Set<TAO_NS_EventType>;
-//template class ACE_Unbounded_Set<TAO_NS_ProxySupplier *>;
+//template class ACE_Unbounded_Set<TAO_Notify_EventType>;
+//template class ACE_Unbounded_Set<TAO_Notify_ProxySupplier *>;
 
 template class ACE_Unbounded_Set_Const_Iterator<int>;
-template class ACE_Unbounded_Set_Iterator<TAO_NS_Proxy *>;
-
-template class TAO_ESF_Copy_On_Write<TAO_NS_Proxy, TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_Peer, TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_Consumer, TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_Supplier, TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_EventChannel, TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_ProxyConsumer, TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_ProxySupplier, TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_NS_SupplierAdmin, TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>, ACE_SYNCH>;
-
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy*>,TAO_SYNCH_MUTEX>;
-
-
-
-template class TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>;
-template class TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>;
-template class TAO_ESF_Proxy_List<TAO_NS_Consumer>;
-template class TAO_ESF_Proxy_List<TAO_NS_Supplier>;
-template class TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>;
-template class TAO_ESF_Proxy_List<TAO_NS_Proxy>;
-template class TAO_ESF_Proxy_List<TAO_NS_EventChannel>;
-template class TAO_ESF_Proxy_List<TAO_NS_Peer>;
-template class TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>;
-
-template class ACE_Unbounded_Set_Ex<TAO_NS_Peer *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_Supplier *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_Consumer *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_ProxyConsumer *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_ProxySupplier *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_ConsumerAdmin *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_SupplierAdmin *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_EventChannel *>;
-template class ACE_Unbounded_Set_Ex<TAO_NS_Proxy *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>;
+
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy*>,TAO_SYNCH_MUTEX>;
+
+
+
+template class TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>;
+template class TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>;
+template class TAO_ESF_Proxy_List<TAO_Notify_Consumer>;
+template class TAO_ESF_Proxy_List<TAO_Notify_Supplier>;
+template class TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>;
+template class TAO_ESF_Proxy_List<TAO_Notify_Proxy>;
+template class TAO_ESF_Proxy_List<TAO_Notify_EventChannel>;
+template class TAO_ESF_Proxy_List<TAO_Notify_Peer>;
+template class TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>;
+
+template class ACE_Unbounded_Set_Ex<TAO_Notify_Peer *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_Supplier *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_Consumer *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_ProxyConsumer *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_ProxySupplier *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_ConsumerAdmin *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_SupplierAdmin *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_EventChannel *>;
+template class ACE_Unbounded_Set_Ex<TAO_Notify_Proxy *>;
 //template class ACE_Unbounded_Set<int>;
 
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>;
+template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>;
 template class ACE_Unbounded_Set_Iterator<int>;
 
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>, ACE_SYNCH>;
-
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>, ACE_SYNCH>;
-
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *> >;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *> >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
-#pragma instantiate TAO_NS_Proxy_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
-#pragma instantiate TAO_NS_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
-#pragma instantiate TAO_NS_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
-#pragma instantiate TAO_NS_Proxy_T <POA_Event_Forwarder::ProxyPushSupplier>
-#pragma instantiate TAO_NS_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
-
-#pragma instantiate TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
-#pragma instantiate TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
-#pragma instantiate TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
-#pragma instantiate TAO_NS_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
-#pragma instantiate TAO_NS_Proxy_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
-
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_ProxyConsumer>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_ProxySupplier>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_EventChannel>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_SupplierAdmin>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_Proxy>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_Consumer>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_Supplier>
-#pragma instantiate TAO_ESF_Proxy_Collection<TAO_NS_Peer>
+#pragma instantiate TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
+#pragma instantiate TAO_Notify_Proxy_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
+#pragma instantiate TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
+#pragma instantiate TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
+#pragma instantiate TAO_Notify_Proxy_T <POA_Event_Forwarder::ProxyPushSupplier>
+#pragma instantiate TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosEventChannelAdmin::ProxyPushSupplier>
+
+#pragma instantiate TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
+#pragma instantiate TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
+#pragma instantiate TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer>
+#pragma instantiate TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
+#pragma instantiate TAO_Notify_Proxy_T <POA_CosEventChannelAdmin::ProxyPushConsumer>
+
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_ProxyConsumer>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_ProxySupplier>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_EventChannel>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_SupplierAdmin>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_Proxy>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_Consumer>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_Supplier>
+#pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_Peer>
 
 #pragma instantiate ACE_Unbounded_Set<int>
-#pragma instantiate ACE_Unbounded_Set<TAO_NS_EventType>
-//#pragma instantiate ACE_Unbounded_Set<TAO_NS_ProxySupplier *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventType>
+//#pragma instantiate ACE_Unbounded_Set<TAO_Notify_ProxySupplier *>
 
 #pragma instantiate ACE_Unbounded_Set_Const_Iterator<int>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>
-
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_Proxy, TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_Peer, TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_Consumer, TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_Supplier, TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_EventChannel, TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_ProxyConsumer, TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_ProxySupplier, TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_NS_SupplierAdmin, TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>, ACE_SYNCH>
-
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin*>,ACE_SYNCH>#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin*>,ACE_SYNCH>
-#pragma instantitae TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_NS_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy*>,ACE_SYNCH>
-
-
-
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_Consumer>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_Supplier>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_Proxy>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_EventChannel>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_Peer>
-#pragma instantiate TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>
-
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_Peer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_Supplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_Consumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_ProxyConsumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_ProxySupplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_ConsumerAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_SupplierAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_EventChannel *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_NS_Proxy *>
-
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>
+
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
+
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin*>,ACE_SYNCH>#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin*>,ACE_SYNCH>
+#pragma instantitae TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy*>,ACE_SYNCH>
+
+
+
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_Consumer>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_Supplier>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_Proxy>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_EventChannel>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_Peer>
+#pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>
+
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Peer *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Supplier *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Consumer *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ProxyConsumer *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ProxySupplier *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ConsumerAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_SupplierAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_EventChannel *>
+#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Proxy *>
+
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>
+#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<int>
 
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *>, ACE_SYNCH>
-
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxyConsumer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Supplier *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ConsumerAdmin *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_SupplierAdmin *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_EventChannel *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Consumer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Peer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_ProxySupplier *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_NS_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_NS_Proxy *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
+
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *> >
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 61f7086bf5e..fce0e131853 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_DEFAULT_FACTORY_H
-#define TAO_NS_DEFAULT_FACTORY_H
+#ifndef TAO_Notify_DEFAULT_FACTORY_H
+#define TAO_Notify_DEFAULT_FACTORY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,80 +22,80 @@
 #include "Factory.h"
 
 /**
- * @class TAO_NS_Default_Factory
+ * @class TAO_Notify_Default_Factory
  *
  * @brief Default_Factory interface for creating Notify Objects.
  *
  */
-class TAO_Notify_Export TAO_NS_Default_Factory : public TAO_NS_Factory
+class TAO_Notify_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory
 {
 public:
   /// Constructor
-  TAO_NS_Default_Factory (void);
+  TAO_Notify_Default_Factory (void);
 
   /// Destructor
-  virtual ~TAO_NS_Default_Factory ();
+  virtual ~TAO_Notify_Default_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_NS_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_NS_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_NS_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_NS_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_NS_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create Proxy Collection
-  virtual void create (TAO_NS_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_NS_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
 
   /// Create EventChannel
-  virtual void create (TAO_NS_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_NS_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_NS_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_NS_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_NS_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_NS_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_NS_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_NS_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_NS_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_NS_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_NS_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 };
 
-ACE_FACTORY_DECLARE (TAO_Notify, TAO_NS_Default_Factory)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_Default_Factory)
 
 #if defined (__ACE_INLINE__)
 #include "Default_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_DEFAULT_FACTORY_H */
+#endif /* TAO_Notify_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index f6121d1ef23..b1d89eb552a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -6,18 +6,18 @@
 #include "ETCL_Filter.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ETCL_Filter, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$")
 
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
 #include "Notify_Constraint_Visitors.h"
 
-TAO_NS_ETCL_Filter::TAO_NS_ETCL_Filter (void)
+TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void)
   :constraint_expr_ids_ (0)
 {
 }
 
-TAO_NS_ETCL_Filter::~TAO_NS_ETCL_Filter ()
+TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
 {
   ACE_TRY_NEW_ENV
     {
@@ -38,7 +38,7 @@ TAO_NS_ETCL_Filter::~TAO_NS_ETCL_Filter ()
 }
 
 char*
-TAO_NS_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -47,7 +47,7 @@ TAO_NS_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
+TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
                                        ACE_ENV_ARG_DECL
                                        )
   ACE_THROW_SPEC ((
@@ -57,12 +57,12 @@ TAO_NS_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq&
 {
   for (CORBA::ULong index = 0; index < constraint_info_seq.length (); ++index)
     {
-      TAO_NS_Constraint_Expr* notify_constr_expr;
+      TAO_Notify_Constraint_Expr* notify_constr_expr;
 
       ACE_NEW_THROW_EX (notify_constr_expr,
-                        TAO_NS_Constraint_Expr (),
+                        TAO_Notify_Constraint_Expr (),
                         CORBA::NO_MEMORY ());
-      auto_ptr <TAO_NS_Constraint_Expr> auto_expr (notify_constr_expr);
+      auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr);
 
       const CosNotifyFilter::ConstraintExp& expr =
         constraint_info_seq[index].constraint_expression;
@@ -86,7 +86,7 @@ TAO_NS_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq&
 }
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_NS_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
+TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
                                 ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
@@ -136,7 +136,7 @@ TAO_NS_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& co
 }
 
 void
-TAO_NS_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
+TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
                                    ACE_ENV_ARG_DECL
                                    )
@@ -170,8 +170,8 @@ TAO_NS_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq &
     }
 
   // Remove previous entries and save them in case we need to reinstate them.
-  ACE_Array<TAO_NS_Constraint_Expr*> constr_saved (modify_list.length ());
-  TAO_NS_Constraint_Expr* constr_expr = 0;
+  ACE_Array<TAO_Notify_Constraint_Expr*> constr_saved (modify_list.length ());
+  TAO_Notify_Constraint_Expr* constr_expr = 0;
 
   for (index = 0; index < modify_list.length (); ++index)
     {
@@ -226,7 +226,7 @@ TAO_NS_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq &
 }
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_NS_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
+TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
                                 ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -245,7 +245,7 @@ TAO_NS_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id
 
   CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
 
-  TAO_NS_Constraint_Expr *notify_constr_expr = 0;
+  TAO_Notify_Constraint_Expr *notify_constr_expr = 0;
 
   for (u_int index = 0; index < id_list.length (); ++index)
     {
@@ -265,7 +265,7 @@ TAO_NS_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_NS_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -309,7 +309,7 @@ TAO_NS_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ETCL_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -320,7 +320,7 @@ TAO_NS_ETCL_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
@@ -340,7 +340,7 @@ TAO_NS_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -358,7 +358,7 @@ TAO_NS_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_NS_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
+TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -368,7 +368,7 @@ TAO_NS_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
 }
 
 CORBA::Boolean
-TAO_NS_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data
+TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data
                                  ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -382,7 +382,7 @@ TAO_NS_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & f
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
   CONSTRAINT_EXPR_LIST::ENTRY *entry;
 
-  TAO_NS_Constraint_Visitor visitor;
+  TAO_Notify_Constraint_Visitor visitor;
 
   if (visitor.bind_structured_event (filterable_data) != 0)
     {
@@ -405,7 +405,7 @@ TAO_NS_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & f
 }
 
 CORBA::Boolean
-TAO_NS_ETCL_Filter::match_typed (
+TAO_Notify_ETCL_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
                             ACE_ENV_ARG_DECL
                             )
@@ -417,7 +417,7 @@ TAO_NS_ETCL_Filter::match_typed (
 }
 
 CosNotifyFilter::CallbackID
-TAO_NS_ETCL_Filter::attach_callback (
+TAO_Notify_ETCL_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
                                 ACE_ENV_ARG_DECL
                                 )
@@ -428,7 +428,7 @@ TAO_NS_ETCL_Filter::attach_callback (
 }
 
 void
-TAO_NS_ETCL_Filter::detach_callback (
+TAO_Notify_ETCL_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
                                 ACE_ENV_ARG_DECL
                                 )
@@ -439,7 +439,7 @@ TAO_NS_ETCL_Filter::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_NS_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -447,42 +447,42 @@ TAO_NS_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr *>;
-template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr *>;
+template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>;
 
 #if !defined (ACE_HAS_STD_TEMPLATE_SPECIALIZATION)
 template class ACE_Equal_To<CosNotifyFilter::ConstraintID>;
 #endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
 
-template class ACE_Array<TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*>;
-template class ACE_Array_Base<TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*>;
+template class ACE_Array<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>;
+template class ACE_Array_Base<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>;
 
 template class auto_ptr<CosNotifyFilter::ConstraintInfoSeq>;
 template class ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*>
-#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>
+#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>
 
 #if !defined (ACE_HAS_STD_TEMPLATE_SPECIALIZATION)
 #pragma instantiate ACE_Equal_To<CosNotifyFilter::ConstraintID>
 #endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
 
-#pragma instantiate ACE_Array<TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*>
-#pragma instantiate ACE_Array_Base<TAO_NS_ETCL_Filter::TAO_NS_Constraint_Expr*>
+#pragma instantiate ACE_Array<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>
+#pragma instantiate ACE_Array_Base<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>
 
 #pragma instantiate auto_ptr<CosNotifyFilter::ConstraintInfoSeq>
 #pragma instantiate ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 6e83250913b..ff174c33398 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ETCL_FILTER_H
-#define TAO_NS_ETCL_FILTER_H
+#ifndef TAO_Notify_ETCL_FILTER_H
+#define TAO_Notify_ETCL_FILTER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -38,14 +38,14 @@
  * @brief Implementation of CosNotifyFilter::Filter servant.
  *
  */
-class TAO_Notify_Export TAO_NS_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
+class TAO_Notify_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
 {
 public:
   /// Constuctor
-  TAO_NS_ETCL_Filter (void);
+  TAO_Notify_ETCL_Filter (void);
 
   /// Destructor
-  ~TAO_NS_ETCL_Filter ();
+  ~TAO_Notify_ETCL_Filter ();
 
 protected:
   virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
@@ -136,7 +136,7 @@ private:
                      CORBA::SystemException
                      ));
 
-  struct TAO_NS_Constraint_Expr
+  struct TAO_Notify_Constraint_Expr
   {
     // = DESCRIPTION
     //   Structure for associating ConstraintInfo with an interpreter.
@@ -144,7 +144,7 @@ private:
     CosNotifyFilter::ConstraintExp constr_expr;
     // Constraint Expression.
 
-    TAO_NS_Constraint_Interpreter interpreter;
+    TAO_Notify_Constraint_Interpreter interpreter;
     // Constraint Interpreter.
   };
 
@@ -156,7 +156,7 @@ private:
 
   /// A list of the constraints stored in this filter.
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::ConstraintID,
-                                ACE_NESTED_CLASS (TAO_NS_ETCL_Filter, TAO_NS_Constraint_Expr*),
+                                ACE_NESTED_CLASS (TAO_Notify_ETCL_Filter, TAO_Notify_Constraint_Expr*),
                                 ACE_SYNCH_NULL_MUTEX>
   CONSTRAINT_EXPR_LIST;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index f9a2d90f924..a1984684d40 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -6,20 +6,20 @@
 #include "ETCL_FilterFactory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ETCL_FilterFactory, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
 
 #include "ETCL_Filter.h"
 
-TAO_NS_ETCL_FilterFactory::TAO_NS_ETCL_FilterFactory (void)
+TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void)
 {
 }
 
-TAO_NS_ETCL_FilterFactory::~TAO_NS_ETCL_FilterFactory ()
+TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
 {
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NS_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
@@ -29,7 +29,7 @@ TAO_NS_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_A
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
@@ -43,10 +43,10 @@ TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV
 
 
   // Create the RefCounted servant.
-  TAO_NS_ETCL_Filter* filter = 0;
+  TAO_Notify_ETCL_Filter* filter = 0;
 
   ACE_NEW_THROW_EX (filter,
-                    TAO_NS_ETCL_Filter (),
+                    TAO_Notify_ETCL_Filter (),
                     CORBA::NO_MEMORY ());
 
   PortableServer::ServantBase_var filter_var (filter);
@@ -66,7 +66,7 @@ TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NS_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
+TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
                                                   ACE_ENV_ARG_DECL
                                                   )
@@ -78,4 +78,4 @@ TAO_NS_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_gram
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
 }
 
-ACE_FACTORY_DEFINE (TAO_Notify, TAO_NS_ETCL_FilterFactory)
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_ETCL_FilterFactory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 2257259fc0a..f99e163c40a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ETCL_FILTERFACTORY_H
-#define TAO_NS_ETCL_FILTERFACTORY_H
+#ifndef TAO_Notify_ETCL_FILTERFACTORY_H
+#define TAO_Notify_ETCL_FILTERFACTORY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -30,23 +30,23 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_ETCL_FilterFactory
+ * @class TAO_Notify_ETCL_FilterFactory
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_ETCL_FilterFactory : public virtual PortableServer::RefCountServantBase
+class TAO_Notify_Export TAO_Notify_ETCL_FilterFactory : public virtual PortableServer::RefCountServantBase
                                                   , public virtual POA_CosNotifyFilter::FilterFactory
-                                                  , public TAO_NS_FilterFactory
+                                                  , public TAO_Notify_FilterFactory
 {
 public:
   /// Constuctor
-  TAO_NS_ETCL_FilterFactory (void);
+  TAO_Notify_ETCL_FilterFactory (void);
 
   /// Destructor
-  ~TAO_NS_ETCL_FilterFactory ();
+  ~TAO_Notify_ETCL_FilterFactory ();
 
-  ///= TAO_NS_FilterFactory methods.
+  ///= TAO_Notify_FilterFactory methods.
 
   virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL);
 
@@ -78,11 +78,11 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-ACE_FACTORY_DECLARE (TAO_Notify, TAO_NS_ETCL_FilterFactory)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_ETCL_FilterFactory)
 
 #if defined (__ACE_INLINE__)
 #include "ETCL_FilterFactory.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ETCL_FILTERFACTORY_H */
+#endif /* TAO_Notify_ETCL_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index cde5a019832..4c06515781f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -6,12 +6,12 @@
 #include "Event.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Event, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Event, "$Id$")
 
 #include "tao/debug.h"
 #include "orbsvcs/CosNotificationC.h"
 
-TAO_NS_Event::TAO_NS_Event (void)
+TAO_Notify_Event::TAO_Notify_Event (void)
   :priority_ (CosNotification::Priority, CosNotification::DefaultPriority),
    timeout_ (CosNotification::Timeout)
 {
@@ -19,14 +19,14 @@ TAO_NS_Event::TAO_NS_Event (void)
   //  ACE_DEBUG ((LM_DEBUG,"event:%x  created\n", this ));
 }
 
-TAO_NS_Event::~TAO_NS_Event ()
+TAO_Notify_Event::~TAO_Notify_Event ()
 {
   // if (TAO_debug_level > 1)
   //  ACE_DEBUG ((LM_DEBUG,"event:%x  destroyed\n", this ));
 }
 
 void
-TAO_NS_Event::translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification)
+TAO_Notify_Event::translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification)
 {
   notification.remainder_of_body <<= any;
   notification.header.fixed_header.event_type.type_name = CORBA::string_dup ("%ANY");
@@ -34,25 +34,25 @@ TAO_NS_Event::translate (const CORBA::Any& any, CosNotification::StructuredEvent
 }
 
 void
-TAO_NS_Event::translate (const CosNotification::StructuredEvent& notification, CORBA::Any& any)
+TAO_Notify_Event::translate (const CosNotification::StructuredEvent& notification, CORBA::Any& any)
 {
   any <<= notification;   // is the typecode set by this operation or do we need to set it explicity.
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Auto_Basic_Ptr<TAO_NS_Event>;
-template class ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX>;
-template class ACE_Unbounded_Queue<TAO_NS_Event_var>;
-template class ACE_Node<TAO_NS_Event_var>;
-template class ACE_Unbounded_Queue_Iterator<TAO_NS_Event_var>;
+template class ACE_Auto_Basic_Ptr<TAO_Notify_Event>;
+template class ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX>;
+template class ACE_Unbounded_Queue<TAO_Notify_Event_var>;
+template class ACE_Node<TAO_Notify_Event_var>;
+template class ACE_Unbounded_Queue_Iterator<TAO_Notify_Event_var>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_NS_Event>
-#pragma instantiate ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Unbounded_Queue<TAO_NS_Event_var>
-#pragma instantiate ACE_Node<TAO_NS_Event_var>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_NS_Event_var>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify_Event>
+#pragma instantiate ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Unbounded_Queue<TAO_Notify_Event_var>
+#pragma instantiate ACE_Node<TAO_Notify_Event_var>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_Notify_Event_var>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index c232eb8bafb..12c1b6e111a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENT_H
-#define TAO_NS_EVENT_H
+#ifndef TAO_Notify_EVENT_H
+#define TAO_Notify_EVENT_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -27,26 +27,26 @@
 #include "Property.h"
 #include "Property_T.h"
 
-class TAO_NS_Consumer;
-class TAO_NS_EventType;
+class TAO_Notify_Consumer;
+class TAO_Notify_EventType;
 
 /**
- * @class TAO_NS_Event
+ * @class TAO_Notify_Event
  *
  * @brief Base class abstraction for Events flowing through the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_Event : private ACE_Copy_Disabled
+class TAO_Notify_Export TAO_Notify_Event : private ACE_Copy_Disabled
 {
 public:
   /// Constuctor
-  TAO_NS_Event (void);
+  TAO_Notify_Event (void);
 
   /// Destructor
-  virtual ~TAO_NS_Event ();
+  virtual ~TAO_Notify_Event ();
 
   /// Copy the event.
-  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
 
   /// Translate Any to Structured
   static void translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification);
@@ -55,7 +55,7 @@ public:
   static void translate (const CosNotification::StructuredEvent& notification, CORBA::Any& any);
 
   /// Get the event type.
-  virtual const TAO_NS_EventType& type (void) const = 0;
+  virtual const TAO_Notify_EventType& type (void) const = 0;
 
   /// Returns true if the filter matches.
   virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const = 0;
@@ -64,7 +64,7 @@ public:
   virtual void convert (CosNotification::StructuredEvent& notification) const = 0;
 
   /// Push event to consumer
-  virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const = 0;
 
   /// Push event to the Event_Forwarder interface
   virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
@@ -80,61 +80,61 @@ public:
 
   ///= Accessors
   /// Priority
-  const TAO_NS_Property_Short& priority (void) const;
+  const TAO_Notify_Property_Short& priority (void) const;
 
   /// Timeout
-  const TAO_NS_Property_Time& timeout (void) const;
+  const TAO_Notify_Property_Time& timeout (void) const;
 
 protected:
   /// = QoS properties
 
   /// Priority.
-  TAO_NS_Property_Short priority_;
+  TAO_Notify_Property_Short priority_;
 
   /// Timeout.
-  TAO_NS_Property_Time timeout_;
+  TAO_Notify_Property_Time timeout_;
 };
 
-typedef ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX> TAO_NS_Event_var_Base;
+typedef ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX> TAO_Notify_Event_var_Base;
 
 /**
- * @class TAO_NS_Event_var
+ * @class TAO_Notify_Event_var
  *
  * @brief A Non-Copy version of the ACE_Refcounted_Auto_Ptr that hides the constructors.
  *
  */
-class TAO_NS_Event_var : public TAO_NS_Event_var_Base
+class TAO_Notify_Event_var : public TAO_Notify_Event_var_Base
 {
 public:
   /// Default Constructor
-  TAO_NS_Event_var (void);
+  TAO_Notify_Event_var (void);
 
 protected:
   /// Constructor
-  TAO_NS_Event_var (TAO_NS_Event* event);
+  TAO_Notify_Event_var (TAO_Notify_Event* event);
 };
 
 /**
- * @class TAO_NS_Event
+ * @class TAO_Notify_Event
  *
- * @brief A version of the ACE_Refcounted_Auto_Ptr that allows construction from a TAO_NS_Event
+ * @brief A version of the ACE_Refcounted_Auto_Ptr that allows construction from a TAO_Notify_Event
  *
  */
-class TAO_NS_Event_Copy_var : public TAO_NS_Event_var
+class TAO_Notify_Event_Copy_var : public TAO_Notify_Event_var
 {
 public:
   /// Default Constructor
-  TAO_NS_Event_Copy_var (void);
+  TAO_Notify_Event_Copy_var (void);
 
   /// Constructor
-  TAO_NS_Event_Copy_var (TAO_NS_Event* event);
+  TAO_Notify_Event_Copy_var (TAO_Notify_Event* event);
 };
 
-typedef ACE_Unbounded_Queue<TAO_NS_Event_var> TAO_NS_Event_Collection;
+typedef ACE_Unbounded_Queue<TAO_Notify_Event_var> TAO_Notify_Event_Collection;
 
 #if defined (__ACE_INLINE__)
 #include "Event.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENT_H */
+#endif /* TAO_Notify_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index fa6f0bb9622..02006440911 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -1,13 +1,13 @@
 // $Id$
 
-ACE_INLINE const TAO_NS_Property_Short&
-TAO_NS_Event::priority (void) const
+ACE_INLINE const TAO_Notify_Property_Short&
+TAO_Notify_Event::priority (void) const
 {
   return this->priority_;
 }
 
-ACE_INLINE const TAO_NS_Property_Time&
-TAO_NS_Event::timeout (void) const
+ACE_INLINE const TAO_Notify_Property_Time&
+TAO_Notify_Event::timeout (void) const
 {
   return this->timeout_;
 }
@@ -15,27 +15,27 @@ TAO_NS_Event::timeout (void) const
 /**********************************************************/
 
 ACE_INLINE
-TAO_NS_Event_var::TAO_NS_Event_var (void)
-  : TAO_NS_Event_var_Base ()
+TAO_Notify_Event_var::TAO_Notify_Event_var (void)
+  : TAO_Notify_Event_var_Base ()
 {
 }
 
 ACE_INLINE
-TAO_NS_Event_var::TAO_NS_Event_var (TAO_NS_Event* event)
-  : TAO_NS_Event_var_Base (event)
+TAO_Notify_Event_var::TAO_Notify_Event_var (TAO_Notify_Event* event)
+  : TAO_Notify_Event_var_Base (event)
 {
 }
 
 /**********************************************************/
 
 ACE_INLINE
-TAO_NS_Event_Copy_var::TAO_NS_Event_Copy_var (void)
-  : TAO_NS_Event_var ()
+TAO_Notify_Event_Copy_var::TAO_Notify_Event_Copy_var (void)
+  : TAO_Notify_Event_var ()
 {
 }
 
 ACE_INLINE
-TAO_NS_Event_Copy_var::TAO_NS_Event_Copy_var (TAO_NS_Event* event)
-  : TAO_NS_Event_var (event)
+TAO_Notify_Event_Copy_var::TAO_Notify_Event_Copy_var (TAO_Notify_Event* event)
+  : TAO_Notify_Event_var (event)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 1036ca62a8c..3985ef9d899 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -17,31 +17,31 @@
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
 
-ACE_RCSID(Notify, TAO_NS_EventChannel, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$")
 
-typedef TAO_NS_Find_Worker_T<TAO_NS_ConsumerAdmin
+typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
                              , CosNotifyChannelAdmin::ConsumerAdmin
                              , CosNotifyChannelAdmin::ConsumerAdmin_ptr
                              , CosNotifyChannelAdmin::AdminNotFound>
-TAO_NS_ConsumerAdmin_Find_Worker;
+TAO_Notify_ConsumerAdmin_Find_Worker;
 
-typedef TAO_NS_Find_Worker_T<TAO_NS_SupplierAdmin
+typedef TAO_Notify_Find_Worker_T<TAO_Notify_SupplierAdmin
                              , CosNotifyChannelAdmin::SupplierAdmin
                              , CosNotifyChannelAdmin::SupplierAdmin_ptr
                              , CosNotifyChannelAdmin::AdminNotFound>
-TAO_NS_SupplierAdmin_Find_Worker;
+TAO_Notify_SupplierAdmin_Find_Worker;
 
-typedef TAO_NS_Seq_Worker_T<TAO_NS_ConsumerAdmin> TAO_NS_ConsumerAdmin_Seq_Worker;
-typedef TAO_NS_Seq_Worker_T<TAO_NS_SupplierAdmin> TAO_NS_SupplierAdmin_Seq_Worker;
+typedef TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Seq_Worker;
+typedef TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Seq_Worker;
 
-TAO_NS_EventChannel::TAO_NS_EventChannel (void)
+TAO_Notify_EventChannel::TAO_Notify_EventChannel (void)
   : ecf_ (0)
   , ca_container_ (0)
   , sa_container_ (0)
 {
 }
 
-TAO_NS_EventChannel::~TAO_NS_EventChannel ()
+TAO_Notify_EventChannel::~TAO_Notify_EventChannel ()
 {
   delete this->event_manager_; // The EventChannel always owns the EventManager.
 
@@ -49,12 +49,12 @@ TAO_NS_EventChannel::~TAO_NS_EventChannel ()
 }
 
 void
-TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
+TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::QoSProperties & initial_qos
                            , const CosNotification::AdminProperties & initial_admin
                            ACE_ENV_ARG_DECL)
 {
-  this->TAO_NS_Object::init (ecf);
+  this->TAO_Notify_Object::init (ecf);
 
   this->ecf_ = ecf;
 
@@ -62,7 +62,7 @@ TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
 
   // Init ca_container_
   ACE_NEW_THROW_EX (this->ca_container_,
-                    TAO_NS_ConsumerAdmin_Container (),
+                    TAO_Notify_ConsumerAdmin_Container (),
                     CORBA::INTERNAL ());
   ACE_CHECK;
 
@@ -71,18 +71,18 @@ TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
 
   // Init ca_container_
   ACE_NEW_THROW_EX (this->sa_container_,
-                    TAO_NS_SupplierAdmin_Container (),
+                    TAO_Notify_SupplierAdmin_Container (),
                     CORBA::INTERNAL ());
   ACE_CHECK;
 
   this->sa_container_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_NS_AdminProperties* admin_properties = 0;
+  TAO_Notify_AdminProperties* admin_properties = 0;
 
   // Set the admin properties.
   ACE_NEW_THROW_EX (admin_properties,
-                    TAO_NS_AdminProperties (),
+                    TAO_Notify_AdminProperties (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -90,7 +90,7 @@ TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
 
   // create the event manager. @@ use factory
   ACE_NEW_THROW_EX (this->event_manager_,
-                    TAO_NS_Event_Manager (),
+                    TAO_Notify_Event_Manager (),
                     CORBA::INTERNAL ());
   ACE_CHECK;
 
@@ -98,7 +98,7 @@ TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
   ACE_CHECK;
 
   const CosNotification::QoSProperties &default_ec_qos =
-    TAO_NS_PROPERTIES::instance ()->default_event_channel_qos_properties ();
+    TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
 
   this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -120,28 +120,28 @@ TAO_NS_EventChannel::init (TAO_NS_EventChannelFactory* ecf
 }
 
 void
-TAO_NS_EventChannel::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_NS_EventChannel::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_NS_EventChannel::release (void)
+TAO_Notify_EventChannel::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 int
-TAO_NS_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->ca_container_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -159,7 +159,7 @@ TAO_NS_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -174,38 +174,38 @@ TAO_NS_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannel::remove (TAO_NS_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
 {
   this->ca_container_->remove (consumer_admin ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_EventChannel::remove (TAO_NS_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
 {
   this->sa_container_->remove (supplier_admin ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_EventChannel::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_NS_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_NS_EventChannel::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NS_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -214,7 +214,7 @@ TAO_NS_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -223,7 +223,7 @@ TAO_NS_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NS_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -231,7 +231,7 @@ TAO_NS_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (this->default_supplier_admin_.in ());
 }
 
-::CosNotifyFilter::FilterFactory_ptr TAO_NS_EventChannel::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -240,7 +240,7 @@ TAO_NS_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 ::CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
+TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL
                                         )
   ACE_THROW_SPEC ((
@@ -248,11 +248,11 @@ TAO_NS_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupO
                    ))
 
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
 }
 
 ::CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NS_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
+TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id
                                         ACE_ENV_ARG_DECL
                                         )
@@ -260,57 +260,57 @@ TAO_NS_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupO
                    CORBA::SystemException
                    ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
                    ))
 {
-  TAO_NS_ConsumerAdmin_Find_Worker find_worker;
+  TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
 
   return find_worker.resolve (id, *this->ca_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NS_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
                    ))
 {
-  TAO_NS_SupplierAdmin_Find_Worker find_worker;
+  TAO_Notify_SupplierAdmin_Find_Worker find_worker;
 
   return find_worker.resolve (id, *this->sa_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NS_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_ConsumerAdmin_Seq_Worker seq_worker;
+  TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker;
 
   return seq_worker.create (*this->ca_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NS_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_SupplierAdmin_Seq_Worker seq_worker;
+  TAO_Notify_SupplierAdmin_Seq_Worker seq_worker;
 
   return seq_worker.create (*this->sa_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_EventChannel::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedAdmin
@@ -320,7 +320,7 @@ TAO_NS_EventChannel::set_admin (const CosNotification::AdminProperties & admin A
 }
 
 CosNotification::AdminProperties*
-TAO_NS_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -337,7 +337,7 @@ TAO_NS_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -346,7 +346,7 @@ TAO_NS_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_NS_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -355,7 +355,7 @@ TAO_NS_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
+TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
                                    ACE_ENV_ARG_DECL
                                    )
@@ -369,42 +369,42 @@ TAO_NS_EventChannel::validate_qos (const CosNotification::QoSProperties & /*requ
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Find_Worker_T<TAO_NS_ConsumerAdmin
+template class TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
                                     , CosNotifyChannelAdmin::ConsumerAdmin
                                     , CosNotifyChannelAdmin::ConsumerAdmin_ptr
                                     , CosNotifyChannelAdmin::AdminNotFound>;
-template class TAO_NS_Find_Worker_T<TAO_NS_SupplierAdmin
+template class TAO_Notify_Find_Worker_T<TAO_Notify_SupplierAdmin
                                     , CosNotifyChannelAdmin::SupplierAdmin
                                     , CosNotifyChannelAdmin::SupplierAdmin_ptr
                                     , CosNotifyChannelAdmin::AdminNotFound>;
 
-template class TAO_NS_Seq_Worker_T<TAO_NS_ConsumerAdmin>;
-template class TAO_NS_Seq_Worker_T<TAO_NS_SupplierAdmin>;
+template class TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin>;
+template class TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin>;
 
-template class TAO_NS_Container_T <TAO_NS_ConsumerAdmin>;
-template class TAO_NS_Container_T <TAO_NS_SupplierAdmin>;
+template class TAO_Notify_Container_T <TAO_Notify_ConsumerAdmin>;
+template class TAO_Notify_Container_T <TAO_Notify_SupplierAdmin>;
 
-template class TAO_ESF_Shutdown_Proxy<TAO_NS_ConsumerAdmin>;
-template class TAO_ESF_Shutdown_Proxy<TAO_NS_SupplierAdmin>;
+template class TAO_ESF_Shutdown_Proxy<TAO_Notify_ConsumerAdmin>;
+template class TAO_ESF_Shutdown_Proxy<TAO_Notify_SupplierAdmin>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Find_Worker_T<TAO_NS_ConsumerAdmin
+#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
                                     , CosNotifyChannelAdmin::ConsumerAdmin
                                     , CosNotifyChannelAdmin::ConsumerAdmin_ptr
                                     , CosNotifyChannelAdmin::AdminNotFound>
-#pragma instantiate TAO_NS_Find_Worker_T<TAO_NS_SupplierAdmin
+#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_SupplierAdmin
                                     , CosNotifyChannelAdmin::SupplierAdmin
                                     , CosNotifyChannelAdmin::SupplierAdmin_ptr
                                     , CosNotifyChannelAdmin::AdminNotFound>
 
-#pragma instantiate TAO_NS_Seq_Worker_T<TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_NS_Seq_Worker_T<TAO_NS_SupplierAdmin>
+#pragma instantiate TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin>
 
-#pragma instantiate TAO_NS_Container_T <TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_NS_Container_T <TAO_NS_SupplierAdmin>
+#pragma instantiate TAO_Notify_Container_T <TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_Notify_Container_T <TAO_Notify_SupplierAdmin>
 
-#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_SupplierAdmin>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_Notify_SupplierAdmin>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index d49929af4fa..2679e7c3c76 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENTCHANNEL_H
-#define TAO_NS_EVENTCHANNEL_H
+#ifndef TAO_Notify_EVENTCHANNEL_H
+#define TAO_Notify_EVENTCHANNEL_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,10 +22,10 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "Object.h"
 
-class TAO_NS_ConsumerAdmin;
-class TAO_NS_SupplierAdmin;
-class TAO_NS_EventChannelFactory;
-template <class TYPE> class TAO_NS_Container_T;
+class TAO_Notify_ConsumerAdmin;
+class TAO_Notify_SupplierAdmin;
+class TAO_Notify_EventChannelFactory;
+template <class TYPE> class TAO_Notify_Container_T;
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -35,37 +35,37 @@ template <class TYPE> class TAO_NS_Container_T;
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_EventChannel
+ * @class TAO_Notify_EventChannel
  *
  * @brief Implementation of CosNotifyChannelAdmin::EventChannel
  *
  */
-class TAO_Notify_Export TAO_NS_EventChannel : public POA_CosNotifyChannelAdmin::EventChannel
-                                            , public virtual TAO_NS_Object
+class TAO_Notify_Export TAO_Notify_EventChannel : public POA_CosNotifyChannelAdmin::EventChannel
+                                            , public virtual TAO_Notify_Object
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   typedef CosNotifyChannelAdmin::ChannelIDSeq SEQ;
   typedef CosNotifyChannelAdmin::ChannelIDSeq_var SEQ_VAR;
 
   /// Constuctor
-  TAO_NS_EventChannel (void);
+  TAO_Notify_EventChannel (void);
 
   /// Destructor
-  ~TAO_NS_EventChannel ();
+  ~TAO_Notify_EventChannel ();
 
   /// Init
-  void init (TAO_NS_EventChannelFactory* ecf
+  void init (TAO_Notify_EventChannelFactory* ecf
              , const CosNotification::QoSProperties & initial_qos
              , const CosNotification::AdminProperties & initial_admin
              ACE_ENV_ARG_DECL);
 
   /// Remove ConsumerAdmin from its container.
-  void remove (TAO_NS_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
 
   /// Remove SupplierAdmin from its container.
-  void remove (TAO_NS_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
@@ -78,18 +78,18 @@ public:
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
-  typedef TAO_NS_Container_T <TAO_NS_ConsumerAdmin> TAO_NS_ConsumerAdmin_Container;
-  typedef TAO_NS_Container_T <TAO_NS_SupplierAdmin> TAO_NS_SupplierAdmin_Container;
+  typedef TAO_Notify_Container_T <TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Container;
+  typedef TAO_Notify_Container_T <TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Container;
 
   /// = Data Members
   /// The parent object.
-  TAO_NS_EventChannelFactory* ecf_;
+  TAO_Notify_EventChannelFactory* ecf_;
 
   /// ConsumerAdmin Container.
-  TAO_NS_ConsumerAdmin_Container *ca_container_;
+  TAO_Notify_ConsumerAdmin_Container *ca_container_;
 
   /// SupplierAdmin Container.
-  TAO_NS_SupplierAdmin_Container *sa_container_;
+  TAO_Notify_SupplierAdmin_Container *sa_container_;
 
   // Default Consumer Admin
   CosNotifyChannelAdmin::ConsumerAdmin_var default_consumer_admin_;
@@ -218,4 +218,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENTCHANNEL_H */
+#endif /* TAO_Notify_EVENTCHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index f00ff387b37..debe138d960 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -6,7 +6,7 @@
 #include "EventChannelFactory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_EventChannelFactory, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 
 #include "ace/Dynamic_Service.h"
 #include "Properties.h"
@@ -17,25 +17,25 @@ ACE_RCSID(Notify, TAO_NS_EventChannelFactory, "$Id$")
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
 
-typedef TAO_NS_Find_Worker_T<TAO_NS_EventChannel
+typedef TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
                              , CosNotifyChannelAdmin::EventChannel
                              , CosNotifyChannelAdmin::EventChannel_ptr
                              , CosNotifyChannelAdmin::ChannelNotFound>
-TAO_NS_EventChannel_Find_Worker;
+TAO_Notify_EventChannel_Find_Worker;
 
-typedef TAO_NS_Seq_Worker_T<TAO_NS_EventChannel> TAO_NS_EventChannel_Seq_Worker;
+typedef TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Seq_Worker;
 
-TAO_NS_EventChannelFactory::TAO_NS_EventChannelFactory (void)
+TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void)
   :ec_container_ (0)
 {
 }
 
-TAO_NS_EventChannelFactory::~TAO_NS_EventChannelFactory ()
+TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
 {
 }
 
 void
-TAO_NS_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -43,7 +43,7 @@ TAO_NS_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
-  TAO_NS_Properties* properties = TAO_NS_PROPERTIES::instance();
+  TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
 
   delete this->ec_container_;
 
@@ -57,30 +57,30 @@ TAO_NS_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   this->default_filter_factory_ =
-    TAO_NS_PROPERTIES::instance()->builder()->build_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+    TAO_Notify_PROPERTIES::instance()->builder()->build_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Init ec_container_
   ACE_NEW_THROW_EX (this->ec_container_,
-                    TAO_NS_EventChannel_Container (),
+                    TAO_Notify_EventChannel_Container (),
                     CORBA::INTERNAL ());
   ACE_CHECK;
 
   this->ec_container_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_NS_POA_Helper* object_poa = 0;
+  TAO_Notify_POA_Helper* object_poa = 0;
 
   // Bootstrap initial Object POA
   ACE_NEW_THROW_EX (object_poa,
-                    TAO_NS_POA_Helper (),
+                    TAO_Notify_POA_Helper (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  auto_ptr<TAO_NS_POA_Helper> auto_object_poa (object_poa);
+  auto_ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
 
   object_poa->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -98,35 +98,35 @@ TAO_NS_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannelFactory::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_NS_EventChannelFactory::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_NS_EventChannelFactory::release (void)
+TAO_Notify_EventChannelFactory::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_EventChannelFactory::remove (TAO_NS_EventChannel* event_channel ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel ACE_ENV_ARG_DECL)
 {
   this->ec_container_->remove (event_channel ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
-TAO_NS_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->ec_container_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -136,12 +136,12 @@ TAO_NS_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NS_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ());
 }
 
-::CosNotifyChannelAdmin::EventChannel_ptr TAO_NS_EventChannelFactory::create_channel (
+::CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory::create_channel (
     const CosNotification::QoSProperties & initial_qos,
     const CosNotification::AdminProperties & initial_admin,
     CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL
@@ -152,7 +152,7 @@ TAO_NS_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_
                    , CosNotification::UnsupportedAdmin
                    ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_event_channel (this
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
                                                                         , initial_qos
                                                                         , initial_admin
                                                                         , id
@@ -160,50 +160,50 @@ TAO_NS_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_NS_EventChannelFactory::get_all_channels (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_all_channels (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_NS_EventChannel_Seq_Worker seq_worker;
+  TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
   return seq_worker.create (*this->ec_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NS_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ChannelNotFound
                    ))
 {
-  TAO_NS_EventChannel_Find_Worker find_worker;
+  TAO_Notify_EventChannel_Find_Worker find_worker;
 
   return find_worker.resolve (id, *this->ec_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Find_Worker_T<TAO_NS_EventChannel
+template class TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
                               , CosNotifyChannelAdmin::EventChannel
                               , CosNotifyChannelAdmin::EventChannel_ptr
                               , CosNotifyChannelAdmin::ChannelNotFound>;
-template class TAO_NS_Seq_Worker_T<TAO_NS_EventChannel>;
+template class TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel>;
 
-template class TAO_NS_Container_T <TAO_NS_EventChannel>;
+template class TAO_Notify_Container_T <TAO_Notify_EventChannel>;
 
-template class TAO_ESF_Shutdown_Proxy<TAO_NS_EventChannel>;
+template class TAO_ESF_Shutdown_Proxy<TAO_Notify_EventChannel>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_NS_Find_Worker_T<TAO_NS_EventChannel
+#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
                               , CosNotifyChannelAdmin::EventChannel
                               , CosNotifyChannelAdmin::EventChannel_ptr
                               , CosNotifyChannelAdmin::ChannelNotFound>
-#pragma instantiate TAO_NS_Seq_Worker_T<TAO_NS_EventChannel>
+#pragma instantiate TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel>
 
 
-#pragma instantiate TAO_NS_Container_T <TAO_NS_EventChannel>
+#pragma instantiate TAO_Notify_Container_T <TAO_Notify_EventChannel>
 
-#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_EventChannel>;
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_Notify_EventChannel>;
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 268618aaf32..c1d44aa739c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENTCHANNELFACTORY_H
-#define TAO_NS_EVENTCHANNELFACTORY_H
+#ifndef TAO_Notify_EVENTCHANNELFACTORY_H
+#define TAO_Notify_EVENTCHANNELFACTORY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,8 +23,8 @@
 #include "orbsvcs/NotifyExtS.h"
 #include "Object.h"
 
-class TAO_NS_EventChannel;
-template <class TYPE> class TAO_NS_Container_T;
+class TAO_Notify_EventChannel;
+template <class TYPE> class TAO_Notify_Container_T;
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -34,25 +34,25 @@ template <class TYPE> class TAO_NS_Container_T;
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_EventChannelFactory
+ * @class TAO_Notify_EventChannelFactory
  *
  * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory
  *
  */
-class TAO_Notify_Export TAO_NS_EventChannelFactory : public virtual POA_NotifyExt::EventChannelFactory
-                                                   , public virtual TAO_NS_Object
+class TAO_Notify_Export TAO_Notify_EventChannelFactory : public virtual POA_NotifyExt::EventChannelFactory
+                                                   , public virtual TAO_Notify_Object
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_EventChannelFactory (void);
+  TAO_Notify_EventChannelFactory (void);
 
   /// Init the factory
   void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
 
   /// Destructor
-  virtual ~TAO_NS_EventChannelFactory ();
+  virtual ~TAO_Notify_EventChannelFactory ();
 
   /// = ServantBase  Methods
   virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
@@ -62,7 +62,7 @@ public:
   virtual void release (void);
 
   /// Remove <channel> from the <ec_container_>
-  void remove (TAO_NS_EventChannel* channel ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_EventChannel* channel ACE_ENV_ARG_DECL);
 
   /// Accesor for the default filter factory shared by all EC's.
   virtual CosNotifyFilter::FilterFactory_ptr get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
@@ -71,11 +71,11 @@ public:
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
  protected:
-  typedef TAO_NS_Container_T<TAO_NS_EventChannel> TAO_NS_EventChannel_Container;
+  typedef TAO_Notify_Container_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Container;
 
   /// = Data Members
   /// Container for Event Channels.
-  TAO_NS_EventChannel_Container *ec_container_;
+  TAO_Notify_EventChannel_Container *ec_container_;
 
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
@@ -119,4 +119,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENTCHANNELFACTORY_H */
+#endif /* TAO_Notify_EVENTCHANNELFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index ffd461a55d8..29edc6ea27e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -6,20 +6,20 @@
 #include "EventType.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_EventType, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_EventType, "$Id$")
 
-TAO_NS_EventType
-TAO_NS_EventType::special (void)
+TAO_Notify_EventType
+TAO_Notify_EventType::special (void)
 {
-  return TAO_NS_EventType ("*", "%ALL");
+  return TAO_Notify_EventType ("*", "%ALL");
 }
 
-TAO_NS_EventType::TAO_NS_EventType (void)
+TAO_Notify_EventType::TAO_Notify_EventType (void)
 {
 }
 
 void
-TAO_NS_EventType::init_i (const char* domain_name, const char* type_name)
+TAO_Notify_EventType::init_i (const char* domain_name, const char* type_name)
 {
   this->event_type_.domain_name = domain_name;
   this->event_type_.type_name = type_name;
@@ -33,22 +33,22 @@ TAO_NS_EventType::init_i (const char* domain_name, const char* type_name)
   this->recompute_hash ();
 }
 
-TAO_NS_EventType::TAO_NS_EventType (const char* domain_name, const char* type_name)
+TAO_Notify_EventType::TAO_Notify_EventType (const char* domain_name, const char* type_name)
 {
   this->init_i (domain_name, type_name);
 }
 
-TAO_NS_EventType::TAO_NS_EventType (const CosNotification::EventType& event_type)
+TAO_Notify_EventType::TAO_Notify_EventType (const CosNotification::EventType& event_type)
 {
   this->init_i (event_type.domain_name.in (), event_type.type_name.in ());
 }
 
-TAO_NS_EventType::~TAO_NS_EventType ()
+TAO_Notify_EventType::~TAO_Notify_EventType ()
 {
 }
 
 void
-TAO_NS_EventType::recompute_hash (void)
+TAO_Notify_EventType::recompute_hash (void)
 {
   // @@ Pradeep: this code is bound to crash someday if the strings
   // are too long....  See if the hash_pjw () function can be modified
@@ -66,16 +66,16 @@ TAO_NS_EventType::recompute_hash (void)
   this->hash_value_ =  ACE::hash_pjw (buffer);
 }
 
-TAO_NS_EventType&
-TAO_NS_EventType::operator=(const CosNotification::EventType& event_type)
+TAO_Notify_EventType&
+TAO_Notify_EventType::operator=(const CosNotification::EventType& event_type)
 {
   this->init_i (event_type.domain_name.in (),event_type.type_name.in ());
 
   return *this;
 }
 
-TAO_NS_EventType&
-TAO_NS_EventType::operator=(const TAO_NS_EventType& event_type)
+TAO_Notify_EventType&
+TAO_Notify_EventType::operator=(const TAO_Notify_EventType& event_type)
 {
   if (this == &event_type)
     return *this;
@@ -86,7 +86,7 @@ TAO_NS_EventType::operator=(const TAO_NS_EventType& event_type)
 }
 
 int
-TAO_NS_EventType::operator==(const TAO_NS_EventType& event_type) const
+TAO_Notify_EventType::operator==(const TAO_Notify_EventType& event_type) const
 {
   if (this->hash () != event_type.hash ())
     return 0;
@@ -97,7 +97,7 @@ TAO_NS_EventType::operator==(const TAO_NS_EventType& event_type) const
 }
 
 int
-TAO_NS_EventType::operator!=(const TAO_NS_EventType& event_type) const
+TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const
 {
   if (this->hash () != event_type.hash ())
     return 1;
@@ -108,7 +108,7 @@ TAO_NS_EventType::operator!=(const TAO_NS_EventType& event_type) const
 }
 
 CORBA::Boolean
-TAO_NS_EventType::is_special (void) const
+TAO_Notify_EventType::is_special (void) const
 {
   if ((this->event_type_.domain_name == 0 ||
              ACE_OS::strcmp (this->event_type_.domain_name, "") == 0 ||
@@ -123,7 +123,7 @@ TAO_NS_EventType::is_special (void) const
 }
 
 void
-TAO_NS_EventType::dump (void) const
+TAO_Notify_EventType::dump (void) const
 {
   ACE_DEBUG ((LM_DEBUG, "(%s,%s)", this->event_type_.domain_name.in (), this->event_type_.type_name.in ()));
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index edeaca96cbc..2c45155d0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENTTYPE_H
-#define TAO_NS_EVENTTYPE_H
+#ifndef TAO_Notify_EVENTTYPE_H
+#define TAO_Notify_EVENTTYPE_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,7 +22,7 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_EventType
+ * @class TAO_Notify_EventType
  *
  * @brief
  *
@@ -30,34 +30,34 @@
  * It is used by the Event Manager as a key to find subscription lists.
  *
  */
-class TAO_Notify_Export TAO_NS_EventType
+class TAO_Notify_Export TAO_Notify_EventType
 {
 public:
   /// Constuctor
-  TAO_NS_EventType (void);
-  TAO_NS_EventType (const char* domain_name, const char* type_name);
-  TAO_NS_EventType (const CosNotification::EventType& event_type);
+  TAO_Notify_EventType (void);
+  TAO_Notify_EventType (const char* domain_name, const char* type_name);
+  TAO_Notify_EventType (const CosNotification::EventType& event_type);
   // Constuctor
 
   /// Destructor
-  ~TAO_NS_EventType ();
+  ~TAO_Notify_EventType ();
 
   /// hash value
   u_long hash (void) const;
 
   /// Assignment from CosNotification::EventType
-  TAO_NS_EventType& operator=(const CosNotification::EventType& event_type);
+  TAO_Notify_EventType& operator=(const CosNotification::EventType& event_type);
 
   /// Assignment operator.
-  TAO_NS_EventType& operator=(const TAO_NS_EventType& event_type);
+  TAO_Notify_EventType& operator=(const TAO_Notify_EventType& event_type);
 
   /// == operator
-  int operator==(const TAO_NS_EventType& notify_event_type) const;
+  int operator==(const TAO_Notify_EventType& notify_event_type) const;
 
   /// != operator
-  int operator!=(const TAO_NS_EventType& notify_event_type) const;
+  int operator!=(const TAO_Notify_EventType& notify_event_type) const;
 
-  static TAO_NS_EventType special (void);
+  static TAO_Notify_EventType special (void);
   // Return the special event type.
 
   CORBA::Boolean is_special (void) const;
@@ -89,4 +89,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENTTYPE_H */
+#endif /* TAO_Notify_EVENTTYPE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
index 93af3791bf9..1e0694b488e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
@@ -1,13 +1,13 @@
 // $Id$
 
 ACE_INLINE u_long
-TAO_NS_EventType::hash (void) const
+TAO_Notify_EventType::hash (void) const
 {
   return this->hash_value_;
 }
 
 ACE_INLINE const CosNotification::EventType&
-TAO_NS_EventType::native (void) const
+TAO_Notify_EventType::native (void) const
 {
   return event_type_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index d55c3ed787b..c10a934948d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -6,25 +6,25 @@
 #include "EventTypeSeq.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_EventTypeSeq, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$")
 
-TAO_NS_EventTypeSeq::TAO_NS_EventTypeSeq (void)
+TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void)
 {
 }
 
-TAO_NS_EventTypeSeq::TAO_NS_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq)
+TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq)
 {
   this->insert_seq (event_type_seq);
 }
 
 void
-TAO_NS_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const
+TAO_Notify_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const
 {
   event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ()));
 
   inherited::CONST_ITERATOR iter (*this);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   CORBA::ULong i = 0;
   for (iter.first (); iter.next (event_type); iter.advance (), ++i)
@@ -32,10 +32,10 @@ TAO_NS_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) co
 }
 
 void
-TAO_NS_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_type_seq) const
+TAO_Notify_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_type_seq) const
 {
   // If the special exists in us, don't include it.
-  const TAO_NS_EventType& special = TAO_NS_EventType::special ();
+  const TAO_Notify_EventType& special = TAO_Notify_EventType::special ();
 
   if (this->find (special) == 0)
     {
@@ -46,7 +46,7 @@ TAO_NS_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_t
 
   inherited::CONST_ITERATOR iter (*this);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   CORBA::ULong i = 0;
   for (iter.first (); iter.next (event_type); iter.advance (), ++i)
@@ -57,9 +57,9 @@ TAO_NS_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_t
 }
 
 void
-TAO_NS_EventTypeSeq::insert_seq (const CosNotification::EventTypeSeq& event_type_seq)
+TAO_Notify_EventTypeSeq::insert_seq (const CosNotification::EventTypeSeq& event_type_seq)
 {
-  TAO_NS_EventType event_type;
+  TAO_Notify_EventType event_type;
 
   for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i)
     {
@@ -69,9 +69,9 @@ TAO_NS_EventTypeSeq::insert_seq (const CosNotification::EventTypeSeq& event_type
 }
 
 void
-TAO_NS_EventTypeSeq::remove_seq (const CosNotification::EventTypeSeq& event_type_seq)
+TAO_Notify_EventTypeSeq::remove_seq (const CosNotification::EventTypeSeq& event_type_seq)
 {
-  TAO_NS_EventType event_type;
+  TAO_Notify_EventType event_type;
 
   for (CORBA::ULong i = 0; i < event_type_seq.length (); ++i)
     {
@@ -81,31 +81,31 @@ TAO_NS_EventTypeSeq::remove_seq (const CosNotification::EventTypeSeq& event_type
 }
 
 void
-TAO_NS_EventTypeSeq::insert_seq (const TAO_NS_EventTypeSeq& event_type_seq)
+TAO_Notify_EventTypeSeq::insert_seq (const TAO_Notify_EventTypeSeq& event_type_seq)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (event_type_seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (event_type_seq);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   for (iter.first (); iter.next (event_type); iter.advance ())
     inherited::insert (*event_type);
 }
 
 void
-TAO_NS_EventTypeSeq::remove_seq (const TAO_NS_EventTypeSeq& event_type_seq)
+TAO_Notify_EventTypeSeq::remove_seq (const TAO_Notify_EventTypeSeq& event_type_seq)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (event_type_seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (event_type_seq);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   for (iter.first (); iter.next (event_type); iter.advance ())
     inherited::remove (*event_type);
 }
 
 void
-TAO_NS_EventTypeSeq::init (TAO_NS_EventTypeSeq& seq_added, TAO_NS_EventTypeSeq& seq_remove)
+TAO_Notify_EventTypeSeq::init (TAO_Notify_EventTypeSeq& seq_added, TAO_Notify_EventTypeSeq& seq_remove)
 {
-  const TAO_NS_EventType& special = TAO_NS_EventType::special ();
+  const TAO_Notify_EventType& special = TAO_Notify_EventType::special ();
 
   if (this->find (special) == 0) // If this object has the special type.
     {
@@ -157,7 +157,7 @@ TAO_NS_EventTypeSeq::init (TAO_NS_EventTypeSeq& seq_added, TAO_NS_EventTypeSeq&
               //= First remove the duplicates in the added and removes lists.
               // compute the intersection.
 
-              TAO_NS_EventTypeSeq common;
+              TAO_Notify_EventTypeSeq common;
               common.intersection (seq_added, seq_remove);
 
               // remove the common elements from both the lists so Added {BCDK} and Removed {CDEA} will yield Added {BK} and Removed {EA}
@@ -189,14 +189,14 @@ TAO_NS_EventTypeSeq::init (TAO_NS_EventTypeSeq& seq_added, TAO_NS_EventTypeSeq&
 }
 
 void
-TAO_NS_EventTypeSeq::intersection (const TAO_NS_EventTypeSeq& rhs, const TAO_NS_EventTypeSeq& lhs)
+TAO_Notify_EventTypeSeq::intersection (const TAO_Notify_EventTypeSeq& rhs, const TAO_Notify_EventTypeSeq& lhs)
 {
   // linear search.
-  TAO_NS_EventTypeSeq::CONST_ITERATOR rhs_iter (rhs);
-  TAO_NS_EventType* rhs_event_type;
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR rhs_iter (rhs);
+  TAO_Notify_EventType* rhs_event_type;
 
-  TAO_NS_EventTypeSeq::CONST_ITERATOR lhs_iter (lhs);
-  TAO_NS_EventType* lhs_event_type;
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR lhs_iter (lhs);
+  TAO_Notify_EventType* lhs_event_type;
 
   for (rhs_iter.first (); rhs_iter.next (rhs_event_type); rhs_iter.advance ())
     {
@@ -209,11 +209,11 @@ TAO_NS_EventTypeSeq::intersection (const TAO_NS_EventTypeSeq& rhs, const TAO_NS_
 }
 
 void
-TAO_NS_EventTypeSeq::dump (void) const
+TAO_Notify_EventTypeSeq::dump (void) const
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (*this);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (*this);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   for (iter.first (); iter.next (event_type); iter.advance ())
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index b695dc9ea10..b1258a84933 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENTTYPESEQ_H
-#define TAO_NS_EVENTTYPESEQ_H
+#ifndef TAO_Notify_EVENTTYPESEQ_H
+#define TAO_Notify_EVENTTYPESEQ_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,25 +23,25 @@
 #include "ace/Unbounded_Set.h"
 
 /**
- * @class TAO_NS_EventTypeSeq
+ * @class TAO_Notify_EventTypeSeq
  *
  * @brief Allows operations using the CosNotification::EventTypeSeq type.
  *
  */
-class TAO_Notify_Export TAO_NS_EventTypeSeq : public ACE_Unbounded_Set <TAO_NS_EventType>
+class TAO_Notify_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType>
 {
- typedef ACE_Unbounded_Set <TAO_NS_EventType> inherited;
+ typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited;
 
 public:
   /// Constructor
-  TAO_NS_EventTypeSeq (void);
-  TAO_NS_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq);
+  TAO_Notify_EventTypeSeq (void);
+  TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq);
 
   /// Preprocess the types added and removed.
-  void init (TAO_NS_EventTypeSeq& added, TAO_NS_EventTypeSeq& removed);
+  void init (TAO_Notify_EventTypeSeq& added, TAO_Notify_EventTypeSeq& removed);
 
   /// Populate this sequence with the intersection of rhs and lhs.
-  void intersection (const TAO_NS_EventTypeSeq& rhs, const TAO_NS_EventTypeSeq& lhs);
+  void intersection (const TAO_Notify_EventTypeSeq& rhs, const TAO_Notify_EventTypeSeq& lhs);
 
   /// insert_seq the contents of <event_type_seq> into this object.
   void insert_seq (const CosNotification::EventTypeSeq& event_type_seq);
@@ -50,10 +50,10 @@ public:
   void remove_seq (const CosNotification::EventTypeSeq& event_type_seq);
 
   /// insert_seq the contents of <event_type_seq> into this object.
-  void insert_seq (const TAO_NS_EventTypeSeq& event_type_seq);
+  void insert_seq (const TAO_Notify_EventTypeSeq& event_type_seq);
 
   /// remove_seq the contents of <event_type_seq> from this object.
-  void remove_seq (const TAO_NS_EventTypeSeq& event_type_seq);
+  void remove_seq (const TAO_Notify_EventTypeSeq& event_type_seq);
 
   /// Populate <event_type_seq> with the contents of this object.
   void populate (CosNotification::EventTypeSeq& event_type) const;
@@ -71,4 +71,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENTTYPESEQ_H */
+#endif /* TAO_Notify_EVENTTYPESEQ_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index e64aa52d8c1..9a03b6c3c96 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -7,19 +7,19 @@
 #include "Event_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Event_Manager, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 
 #include "ProxyConsumer.h"
 #include "ProxySupplier.h"
 #include "Consumer_Map.h"
 #include "Supplier_Map.h"
 
-TAO_NS_Event_Manager::TAO_NS_Event_Manager (void)
+TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (void)
   :consumer_map_ (0), supplier_map_ (0)
 {
 }
 
-TAO_NS_Event_Manager::~TAO_NS_Event_Manager ()
+TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager ()
 {
   if (TAO_debug_level > 0)
     {
@@ -32,15 +32,15 @@ TAO_NS_Event_Manager::~TAO_NS_Event_Manager ()
 }
 
 void
-TAO_NS_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->consumer_map_,
-                    TAO_NS_Consumer_Map (),
+                    TAO_Notify_Consumer_Map (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (this->supplier_map_,
-                    TAO_NS_Supplier_Map (),
+                    TAO_Notify_Supplier_Map (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -52,46 +52,46 @@ TAO_NS_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Event_Manager::shutdown (void)
+TAO_Notify_Event_Manager::shutdown (void)
 {
 }
 
 void
-TAO_NS_Event_Manager::connect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
 {
   this->consumer_map_->connect (proxy_supplier ACE_ENV_ARG_PARAMETER);
 
   // Inform about offered types.
-  TAO_NS_EventTypeSeq removed;
+  TAO_Notify_EventTypeSeq removed;
   proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::disconnect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
 {
   this->consumer_map_->disconnect (proxy_supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::connect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
 {
   this->supplier_map_->connect (proxy_consumer ACE_ENV_ARG_PARAMETER);
 
   // Inform about subscription types.
-  TAO_NS_EventTypeSeq removed;
+  TAO_Notify_EventTypeSeq removed;
   proxy_consumer->types_changed (this->subscription_types (), removed ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::disconnect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
 {
   this->supplier_map_->disconnect (proxy_consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::offer_change (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq new_added, last_removed;
+  TAO_Notify_EventTypeSeq new_added, last_removed;
 
   this->publish (proxy_consumer, added, new_added ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -99,36 +99,36 @@ TAO_NS_Event_Manager::offer_change (TAO_NS_ProxyConsumer* proxy_consumer, const
   this->un_publish (proxy_consumer, removed, last_removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_NS_Consumer_Map::ENTRY::COLLECTION* updates_collection = this->consumer_map_->updates_collection ();
+  TAO_Notify_Consumer_Map::ENTRY::COLLECTION* updates_collection = this->consumer_map_->updates_collection ();
 
-  TAO_NS_ProxySupplier_Update_Worker worker (new_added, last_removed);
+  TAO_Notify_ProxySupplier_Update_Worker worker (new_added, last_removed);
 
   if (updates_collection != 0)
     updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::subscription_change (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq new_added, last_removed;
+  TAO_Notify_EventTypeSeq new_added, last_removed;
 
   this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER);
   this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER);
 
-  TAO_NS_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map_->updates_collection ();
+  TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map_->updates_collection ();
 
-  TAO_NS_ProxyConsumer_Update_Worker worker (new_added, last_removed);
+  TAO_Notify_ProxyConsumer_Update_Worker worker (new_added, last_removed);
 
   if (updates_collection != 0)
     updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Event_Manager::subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
-  TAO_NS_EventType* event_type;
+  TAO_Notify_EventType* event_type;
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
@@ -141,11 +141,11 @@ TAO_NS_Event_Manager::subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO
 }
 
 void
-TAO_NS_Event_Manager::un_subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
-  TAO_NS_EventType* event_type = 0;
+  TAO_Notify_EventType* event_type = 0;
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
@@ -158,11 +158,11 @@ TAO_NS_Event_Manager::un_subscribe (TAO_NS_ProxySupplier* proxy_supplier, const
 }
 
 void
-TAO_NS_Event_Manager::publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
-  TAO_NS_EventType* event_type = 0;
+  TAO_Notify_EventType* event_type = 0;
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
@@ -175,11 +175,11 @@ TAO_NS_Event_Manager::publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_N
 }
 
 void
-TAO_NS_Event_Manager::un_publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq::CONST_ITERATOR iter (seq);
+  TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
-  TAO_NS_EventType* event_type = 0;
+  TAO_Notify_EventType* event_type = 0;
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
@@ -193,62 +193,62 @@ TAO_NS_Event_Manager::un_publish (TAO_NS_ProxyConsumer* proxy_consumer, const TA
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX>;
-template class TAO_NS_Event_Map_T<TAO_NS_ProxyConsumer, TAO_SYNCH_RW_MUTEX>;
+template class TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX>;
+template class TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX>;
 
-template class ACE_Hash<TAO_NS_EventType>;
-template class ACE_Equal_To<TAO_NS_EventType>;
+template class ACE_Hash<TAO_Notify_EventType>;
+template class ACE_Equal_To<TAO_Notify_EventType>;
 
-template class TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer>;
-template class TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier>;
+template class TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer>;
+template class TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier>;
 
-template class ACE_Hash_Map_Manager_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager<ACE_CString, CORBA::Any, ACE_Null_Mutex>;
 
-template class ACE_Unbounded_Set<TAO_NS_EventType>;
-template class ACE_Unbounded_Set_Const_Iterator<TAO_NS_EventType>;
-template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> >;
-template class ACE_Unbounded_Set_Iterator<TAO_NS_EventType>;
-
-template class TAO_ESF_Worker<TAO_NS_ProxySupplier>;
-template class TAO_ESF_Worker<TAO_NS_ProxyConsumer>;
-template class TAO_ESF_Worker<TAO_NS_Proxy>;
-template class TAO_ESF_Worker<TAO_NS_Consumer>;
-template class TAO_ESF_Worker<TAO_NS_Peer>;
-template class TAO_ESF_Worker<TAO_NS_SupplierAdmin>;
-template class TAO_ESF_Worker<TAO_NS_ConsumerAdmin>;
-template class TAO_ESF_Worker<TAO_NS_EventChannel>;
-
-template class ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX>;
-template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> >;
-
-template class ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX > >;
-template class ACE_Node<TAO_NS_Supplier *>;
-template class ACE_Node<TAO_NS_SupplierAdmin *>;
-template class ACE_Node<TAO_NS_ConsumerAdmin *>;
-template class ACE_Node<TAO_NS_EventChannel *>;
-template class ACE_Node<TAO_NS_ProxyConsumer *>;
-template class ACE_Node<TAO_NS_EventType>;
-template class ACE_Node<TAO_NS_Peer *>;
-template class ACE_Node<TAO_NS_ProxySupplier *>;
-template class ACE_Node<TAO_NS_Proxy *>;
-template class ACE_Node<TAO_NS_Consumer *>;
-
-template class ACE_Hash_Map_Entry<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *>;
+template class ACE_Unbounded_Set<TAO_Notify_EventType>;
+template class ACE_Unbounded_Set_Const_Iterator<TAO_Notify_EventType>;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX> >;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventType>;
+
+template class TAO_ESF_Worker<TAO_Notify_ProxySupplier>;
+template class TAO_ESF_Worker<TAO_Notify_ProxyConsumer>;
+template class TAO_ESF_Worker<TAO_Notify_Proxy>;
+template class TAO_ESF_Worker<TAO_Notify_Consumer>;
+template class TAO_ESF_Worker<TAO_Notify_Peer>;
+template class TAO_ESF_Worker<TAO_Notify_SupplierAdmin>;
+template class TAO_ESF_Worker<TAO_Notify_ConsumerAdmin>;
+template class TAO_ESF_Worker<TAO_Notify_EventChannel>;
+
+template class ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX>;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX> >;
+
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX > >;
+template class ACE_Node<TAO_Notify_Supplier *>;
+template class ACE_Node<TAO_Notify_SupplierAdmin *>;
+template class ACE_Node<TAO_Notify_ConsumerAdmin *>;
+template class ACE_Node<TAO_Notify_EventChannel *>;
+template class ACE_Node<TAO_Notify_ProxyConsumer *>;
+template class ACE_Node<TAO_Notify_EventType>;
+template class ACE_Node<TAO_Notify_Peer *>;
+template class ACE_Node<TAO_Notify_ProxySupplier *>;
+template class ACE_Node<TAO_Notify_Proxy *>;
+template class ACE_Node<TAO_Notify_Consumer *>;
+
+template class ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *>;
 template class ACE_Hash_Map_Entry<ACE_CString, CORBA::Any>;
-template class ACE_Hash_Map_Entry<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *>;
+template class ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *>;
 
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
 
-template class ACE_Hash_Map_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
 
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>;
 
 template class ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex>;
 
@@ -258,62 +258,62 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any, ACE_Has
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate TAO_NS_Event_Map_T<TAO_NS_ProxyConsumer, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX>
 
-#pragma instantiate ACE_Hash<TAO_NS_EventType>
-#pragma instantiate ACE_Equal_To<TAO_NS_EventType>
+#pragma instantiate ACE_Hash<TAO_Notify_EventType>
+#pragma instantiate ACE_Equal_To<TAO_Notify_EventType>
 
-#pragma instantiate TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer>
-#pragma instantiate TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier>
+#pragma instantiate TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer>
+#pragma instantiate TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier>
 
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Any, ACE_Null_Mutex>
 
-#pragma instantiate ACE_Unbounded_Set<TAO_NS_EventType>
-#pragma instantiate ACE_Unbounded_Set_Const_Iterator<TAO_NS_EventType>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> >
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_NS_EventType>
-
-#pragma instantiate TAO_ESF_Worker<TAO_NS_ProxySupplier>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_ProxyConsumer>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_Proxy>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_Consumer>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_Peer>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_ConsumerAdmin>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_SupplierAdmin>
-#pragma instantiate TAO_ESF_Worker<TAO_NS_EventChannel>
-
-#pragma instantiate ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX > >
-#pragma instantiate ACE_Node<TAO_NS_Supplier *>
-#pragma instantiate ACE_Node<TAO_NS_SupplierAdmin *>
-#pragma instantiate ACE_Node<TAO_NS_ConsumerAdmin *>
-#pragma instantiate ACE_Node<TAO_NS_EventChannel *>
-#pragma instantiate ACE_Node<TAO_NS_ProxyConsumer *>
-#pragma instantiate ACE_Node<TAO_NS_EventType>
-#pragma instantiate ACE_Node<TAO_NS_Peer *>
-#pragma instantiate ACE_Node<TAO_NS_ProxySupplier *>
-#pragma instantiate ACE_Node<TAO_NS_Proxy *>
-#pragma instantiate ACE_Node<TAO_NS_Consumer *>
-
-#pragma instantiate ACE_Hash_Map_Entry<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventType>
+#pragma instantiate ACE_Unbounded_Set_Const_Iterator<TAO_Notify_EventType>
+#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX> >
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventType>
+
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_ProxySupplier>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_Proxy>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_Consumer>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_Peer>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_SupplierAdmin>
+#pragma instantiate TAO_ESF_Worker<TAO_Notify_EventChannel>
+
+#pragma instantiate ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX> >
+
+#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_Notify_Event, TAO_SYNCH_MUTEX > >
+#pragma instantiate ACE_Node<TAO_Notify_Supplier *>
+#pragma instantiate ACE_Node<TAO_Notify_SupplierAdmin *>
+#pragma instantiate ACE_Node<TAO_Notify_ConsumerAdmin *>
+#pragma instantiate ACE_Node<TAO_Notify_EventChannel *>
+#pragma instantiate ACE_Node<TAO_Notify_ProxyConsumer *>
+#pragma instantiate ACE_Node<TAO_Notify_EventType>
+#pragma instantiate ACE_Node<TAO_Notify_Peer *>
+#pragma instantiate ACE_Node<TAO_Notify_ProxySupplier *>
+#pragma instantiate ACE_Node<TAO_Notify_Proxy *>
+#pragma instantiate ACE_Node<TAO_Notify_Consumer *>
+
+#pragma instantiate ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, CORBA::Any>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *>
 
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
 
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
 
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxySupplier> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Hash<TAO_NS_EventType>, ACE_Equal_To<TAO_NS_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxySupplier> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_Event_Map_Entry_T<TAO_Notify_ProxyConsumer> *, ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>, ACE_Null_Mutex>
 
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex>
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index efc8b257831..24c13603671 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENT_MANAGER_H
-#define TAO_NS_EVENT_MANAGER_H
+#ifndef TAO_Notify_EVENT_MANAGER_H
+#define TAO_Notify_EVENT_MANAGER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -21,28 +21,28 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-class TAO_NS_ProxySupplier;
-class TAO_NS_ProxyConsumer;
-class TAO_NS_EventTypeSeq;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_ProxyConsumer;
+class TAO_Notify_EventTypeSeq;
 
-template <class PROXY, class ACE_LOCK> class TAO_NS_Event_Map_T;
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_NS_Consumer_Map;
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_NS_Supplier_Map;
+template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map;
 
 /**
- * @class TAO_NS_Event_Manager
+ * @class TAO_Notify_Event_Manager
  *
  * @brief A class that manages the Consumer and Supplier maps.
  *
  */
-class TAO_Notify_Export TAO_NS_Event_Manager
+class TAO_Notify_Export TAO_Notify_Event_Manager
 {
 public:
   /// Constuctor
-  TAO_NS_Event_Manager (void);
+  TAO_Notify_Event_Manager (void);
 
   /// Destructor
-  ~TAO_NS_Event_Manager ();
+  ~TAO_Notify_Event_Manager ();
 
   /// Init
   void init (ACE_ENV_SINGLE_ARG_DECL);
@@ -51,93 +51,93 @@ public:
   void shutdown (void);
 
   /// Connect ProxySupplier
-  void connect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
 
   /// Disconnect ProxySupplier
-  void disconnect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
 
   /// Connect ProxyConsumer
-  void connect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
 
   /// Disconnect ProxyConsumer
-  void disconnect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
 
   /// Map accessors.
-  TAO_NS_Consumer_Map* consumer_map (void);
-  TAO_NS_Supplier_Map* supplier_map (void);
+  TAO_Notify_Consumer_Map* consumer_map (void);
+  TAO_Notify_Supplier_Map* supplier_map (void);
 
   /// Offer change received on <proxy_consumer>.
-  void offer_change (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
 
   /// Subscription change received on <proxy_supplier>.
-  void subscription_change (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
 
   /// What are the types being offered.
-  const TAO_NS_EventTypeSeq& offered_types (void);
+  const TAO_Notify_EventTypeSeq& offered_types (void);
 
   /// What are the types being subscribed.
-  const TAO_NS_EventTypeSeq& subscription_types (void);
+  const TAO_Notify_EventTypeSeq& subscription_types (void);
 
 protected:
   /// Subscribe <proxy_supplier> to the event type sequence list <seq>.
-  void subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
 
   /// Unsubscribe <proxy_supplier> to the event type sequence list <seq>.
-  void un_subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void un_publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
   /// Consumer Map
-  TAO_NS_Consumer_Map* consumer_map_;
+  TAO_Notify_Consumer_Map* consumer_map_;
 
   /// Supplier Map
-  TAO_NS_Supplier_Map* supplier_map_;
+  TAO_Notify_Supplier_Map* supplier_map_;
 };
 
 /********************************************************************************/
 
 /**
- * @class TAO_NS_ProxyConsumer_Update_Worker
+ * @class TAO_Notify_ProxyConsumer_Update_Worker
  *
  * @brief Inform ProxyConsumer of updates.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_NS_ProxyConsumer>
+class TAO_Notify_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
 {
 public:
-  TAO_NS_ProxyConsumer_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed);
+  TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_NS_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
 
-  const TAO_NS_EventTypeSeq& added_;
-  const TAO_NS_EventTypeSeq& removed_;
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
 };
 
 /********************************************************************************/
 
 /**
- * @class TAO_NS_ProxySupplier_Update_Worker
+ * @class TAO_Notify_ProxySupplier_Update_Worker
  *
  * @brief Inform ProxySupplier of updates.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_NS_ProxySupplier>
+class TAO_Notify_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
 {
 public:
-  TAO_NS_ProxySupplier_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed);
+  TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_NS_ProxySupplier* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
 
-  const TAO_NS_EventTypeSeq& added_;
-  const TAO_NS_EventTypeSeq& removed_;
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
 };
 
 /********************************************************************************/
@@ -147,4 +147,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENT_MANAGER_H */
+#endif /* TAO_Notify_EVENT_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl
index 3ad395f331a..96ea18453c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.inl
@@ -4,52 +4,52 @@
 #include "ProxySupplier.h"
 #include "Event_Map_T.h"
 
-ACE_INLINE TAO_NS_Consumer_Map*
-TAO_NS_Event_Manager::consumer_map (void)
+ACE_INLINE TAO_Notify_Consumer_Map*
+TAO_Notify_Event_Manager::consumer_map (void)
 {
   return this->consumer_map_;
 }
 
-ACE_INLINE TAO_NS_Supplier_Map*
-TAO_NS_Event_Manager::supplier_map (void)
+ACE_INLINE TAO_Notify_Supplier_Map*
+TAO_Notify_Event_Manager::supplier_map (void)
 {
   return this->supplier_map_;
 }
 
-ACE_INLINE const TAO_NS_EventTypeSeq&
-TAO_NS_Event_Manager::offered_types (void)
+ACE_INLINE const TAO_Notify_EventTypeSeq&
+TAO_Notify_Event_Manager::offered_types (void)
 {
   return this->supplier_map_->event_types ();
 }
 
-ACE_INLINE const TAO_NS_EventTypeSeq&
-TAO_NS_Event_Manager::subscription_types (void)
+ACE_INLINE const TAO_Notify_EventTypeSeq&
+TAO_Notify_Event_Manager::subscription_types (void)
 {
   return this->consumer_map_->event_types ();
 }
 
 /********************************************************************************/
 
-ACE_INLINE TAO_NS_ProxyConsumer_Update_Worker::TAO_NS_ProxyConsumer_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed)
+ACE_INLINE TAO_Notify_ProxyConsumer_Update_Worker::TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
   :added_ (added), removed_ (removed)
 {
 }
 
 ACE_INLINE void
-TAO_NS_ProxyConsumer_Update_Worker::work (TAO_NS_ProxyConsumer* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL)
 {
   proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
 }
 
 /********************************************************************************/
 
-ACE_INLINE TAO_NS_ProxySupplier_Update_Worker::TAO_NS_ProxySupplier_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed)
+ACE_INLINE TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
   :added_ (added), removed_ (removed)
 {
 }
 
 ACE_INLINE void
-TAO_NS_ProxySupplier_Update_Worker::work (TAO_NS_ProxySupplier* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL)
 {
   proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 20dc084707c..4017259de03 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_EVENT_MAP_ENTRY_CPP
-#define TAO_NS_EVENT_MAP_ENTRY_CPP
+#ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP
+#define TAO_Notify_EVENT_MAP_ENTRY_CPP
 
 #include "Event_Map_Entry_T.h"
 
@@ -9,44 +9,44 @@
 #include "Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Event_Map_Entry_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Event_Map_Entry_T, "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Properties.h"
 #include "Factory.h"
 
 template <class PROXY>
-TAO_NS_Event_Map_Entry_T<PROXY>::TAO_NS_Event_Map_Entry_T (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void)
   : collection_ (0), count_ (0), usage_count_ (1)
 {
 }
 
 template <class PROXY>
-TAO_NS_Event_Map_Entry_T<PROXY>::~TAO_NS_Event_Map_Entry_T ()
+TAO_Notify_Event_Map_Entry_T<PROXY>::~TAO_Notify_Event_Map_Entry_T ()
 {
   delete collection_;
 }
 
 template <class PROXY> void
-TAO_NS_Event_Map_Entry_T<PROXY>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::init (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   factory->create (collection_ ACE_ENV_ARG_PARAMETER);
 }
 
 template <class PROXY> void
-TAO_NS_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy ACE_ENV_ARG_DECL)
 {
   this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
   ++count_;
 }
 
 template <class PROXY> void
-TAO_NS_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL)
 {
   this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
   --count_;
 }
 
-#endif /* TAO_NS_EVENT_MAP_ENTRY_CPP */
+#endif /* TAO_Notify_EVENT_MAP_ENTRY_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index caca41aecf3..8072fe60465 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENT_MAP_ENTRY_T_H
-#define TAO_NS_EVENT_MAP_ENTRY_T_H
+#ifndef TAO_Notify_EVENT_MAP_ENTRY_T_H
+#define TAO_Notify_EVENT_MAP_ENTRY_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,26 +23,26 @@
 #include "ace/Atomic_Op.h"
 #include "tao/corba.h"
 
-template <class PROXY, class ACE_LOCK> class TAO_NS_Event_Map_T;
+template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T;
 template <class PROXY> class TAO_ESF_Proxy_Collection;
 
 /**
- * @class TAO_NS_Event_Map_Entry_T
+ * @class TAO_Notify_Event_Map_Entry_T
  *
  * @brief The entry stored in the event map.
  *
  */
 template <class PROXY>
-class TAO_NS_Event_Map_Entry_T : private ACE_Copy_Disabled
+class TAO_Notify_Event_Map_Entry_T : private ACE_Copy_Disabled
 {
 public:
   typedef TAO_ESF_Proxy_Collection<PROXY> COLLECTION;
 
   /// Constructor
-  TAO_NS_Event_Map_Entry_T (void);
+  TAO_Notify_Event_Map_Entry_T (void);
 
   /// Destructor
-  ~TAO_NS_Event_Map_Entry_T (void);
+  ~TAO_Notify_Event_Map_Entry_T (void);
 
   /// Init - Allocates collection
   void init (ACE_ENV_SINGLE_ARG_DECL);
@@ -90,4 +90,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENT_MAP_ENTRY_T_H */
+#endif /* TAO_Notify_EVENT_MAP_ENTRY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
index b0dfa7c4676..f01f9b0de6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -1,25 +1,25 @@
 // $Id$
 
 template <class PROXY> ACE_INLINE ACE_TYPENAME
-TAO_NS_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_NS_Event_Map_Entry_T<PROXY>::collection (void) {
+TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
+TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) {
   return collection_;
 }
 
 template <class PROXY> ACE_INLINE int
-TAO_NS_Event_Map_Entry_T<PROXY>::count (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::count (void)
 {
   return this->count_;
 }
 
 template <class PROXY> ACE_INLINE CORBA::ULong
-TAO_NS_Event_Map_Entry_T<PROXY>::_incr_refcnt (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::_incr_refcnt (void)
 {
   return ++this->usage_count_;
 }
 
 template <class PROXY> ACE_INLINE CORBA::ULong
-TAO_NS_Event_Map_Entry_T<PROXY>::_decr_refcnt (void)
+TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void)
 {
   return --this->usage_count_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 381b5233bf7..77de698806d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_EVENT_MAP_T_C
-#define TAO_NS_EVENT_MAP_T_C
+#ifndef TAO_Notify_EVENT_MAP_T_C
+#define TAO_Notify_EVENT_MAP_T_C
 
 #include "Event_Map_T.h"
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
@@ -13,22 +13,22 @@
 #include "Event_Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Event_Map_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Event_Map_T, "$Id$")
 
 template <class PROXY, class ACE_LOCK>
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::TAO_NS_Event_Map_T (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void)
   :proxy_count_ (0)
 {
 
 }
 
 template <class PROXY, class ACE_LOCK>
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::~TAO_NS_Event_Map_T ()
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::~TAO_Notify_Event_Map_T ()
 {
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->broadcast_entry_.init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -37,7 +37,7 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::init (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
 {
   this->updates_entry_.connected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -47,7 +47,7 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
 {
   this->updates_entry_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -57,7 +57,7 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
 {
   ENTRY* entry;
 
@@ -109,7 +109,7 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_NS_EventTyp
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
 {
   ENTRY* entry;
 
@@ -161,4 +161,4 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_NS_EventTyp
   return 0;
 }
 
-#endif /* TAO_NS_EVENT_MAP_T_C */
+#endif /* TAO_Notify_EVENT_MAP_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index b7219b3f509..aa4eb83777a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENT_MAP_T_H
-#define TAO_NS_EVENT_MAP_T_H
+#ifndef TAO_Notify_EVENT_MAP_T_H
+#define TAO_Notify_EVENT_MAP_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -27,23 +27,23 @@
 #include "EventTypeSeq.h"
 
 /**
- * @class TAO_NS_Event_Map_T
+ * @class TAO_Notify_Event_Map_T
  *
  * @brief Template class for storing the collection of Proxys.
  *
  */
 template <class PROXY, class ACE_LOCK>
-class TAO_NS_Event_Map_T
+class TAO_Notify_Event_Map_T
 {
 
 public:
-  typedef  TAO_NS_Event_Map_Entry_T<PROXY> ENTRY;
+  typedef  TAO_Notify_Event_Map_Entry_T<PROXY> ENTRY;
 
   /// Constuctor
-  TAO_NS_Event_Map_T (void);
+  TAO_Notify_Event_Map_T (void);
 
   /// Destructor
-  ~TAO_NS_Event_Map_T ();
+  ~TAO_Notify_Event_Map_T ();
 
   /// Init
   void init (ACE_ENV_SINGLE_ARG_DECL);
@@ -57,16 +57,16 @@ public:
   /// Associate PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the 1st time otherwise returns 0.
   /// Returns -1 on error.
-  int insert (PROXY* proxy, const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL);
+  int insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
 
   /// Remove association of PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the last time otherwise returns 0.
   /// Returns -1 on error.
-  int remove (PROXY* proxy, const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL);
+  int remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
 
   /// Find the collection mapped to the <event_type>
   /// The usage_count on the entry returned is incremented.
-  ENTRY* find (const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL);
+  ENTRY* find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
 
   /// Find the default broadcast list.
   ACE_TYPENAME ENTRY::COLLECTION* broadcast_collection (void);
@@ -78,14 +78,14 @@ public:
   void release (ENTRY* entry);
 
   /// Access all the event types available
-  const TAO_NS_EventTypeSeq& event_types (void);
+  const TAO_Notify_EventTypeSeq& event_types (void);
 
   /// Access number of proxys connected in all.
   int proxy_count (void);
 
 protected:
   /// The Map that stores eventtype to entry mapping.
-  ACE_Hash_Map_Manager <TAO_NS_EventType, ENTRY*, ACE_SYNCH_NULL_MUTEX> map_;
+  ACE_Hash_Map_Manager <TAO_Notify_EventType, ENTRY*, ACE_SYNCH_NULL_MUTEX> map_;
 
   /// The lock to use.
   ACE_LOCK lock_;
@@ -100,7 +100,7 @@ protected:
   ENTRY updates_entry_;
 
   /// The event types that are available in this map.
-  TAO_NS_EventTypeSeq event_types_;
+  TAO_Notify_EventTypeSeq event_types_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -116,4 +116,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENT_MAP_T_H */
+#endif /* TAO_Notify_EVENT_MAP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index fb81c86a0b0..c3368bddbbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -1,9 +1,9 @@
 // $Id$
 
-template <class PROXY, class ACE_LOCK> ACE_INLINE  TAO_NS_Event_Map_Entry_T<PROXY>*
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_NS_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED)
+template <class PROXY, class ACE_LOCK> ACE_INLINE  TAO_Notify_Event_Map_Entry_T<PROXY>*
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED)
 {
-  TAO_NS_Event_Map_Entry_T<PROXY>* entry;
+  TAO_Notify_Event_Map_Entry_T<PROXY>* entry;
 
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, 0);
 
@@ -17,7 +17,7 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_NS_EventType& event_type AC
 }
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE void
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry)
 {
   ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -25,26 +25,26 @@ TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry)
     delete entry;
 }
 
-template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_NS_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection (void)
+template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection (void)
 {
   return this->broadcast_entry_.collection ();
 }
 
-template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_NS_Event_Map_Entry_T<PROXY>::COLLECTION*
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::updates_collection (void)
+template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection (void)
 {
   return this->updates_entry_.collection ();
 }
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE int
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::proxy_count (void)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::proxy_count (void)
 {
   return this->proxy_count_;
 }
 
-template <class PROXY, class ACE_LOCK> ACE_INLINE const TAO_NS_EventTypeSeq&
-TAO_NS_Event_Map_T<PROXY, ACE_LOCK>::event_types (void)
+template <class PROXY, class ACE_LOCK> ACE_INLINE const TAO_Notify_EventTypeSeq&
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void)
 {
   return this->event_types_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index 2f0ee401cba..4fe0a379914 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_FACTORY_H
-#define TAO_NS_FACTORY_H
+#ifndef TAO_Notify_FACTORY_H
+#define TAO_Notify_FACTORY_H
 #include "ace/pre.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -22,101 +22,101 @@
 #include "ace/Service_Object.h"
 
 class ACE_Lock;
-class TAO_NS_Object;
-class TAO_NS_EventChannelFactory;
-class TAO_NS_EventChannel;
-class TAO_NS_SupplierAdmin;
-class TAO_NS_ConsumerAdmin;
-class TAO_NS_ProxyPushConsumer;
-class TAO_NS_CosEC_ProxyPushSupplier;
-class TAO_NS_CosEC_ProxyPushConsumer;
-class TAO_NS_ProxyPushSupplier;
-class TAO_NS_StructuredProxyPushConsumer;
-class TAO_NS_StructuredProxyPushSupplier;
-class TAO_NS_SequenceProxyPushConsumer;
-class TAO_NS_SequenceProxyPushSupplier;
-class TAO_NS_ProxyConsumer;
-class TAO_NS_ProxySupplier;
-class TAO_NS_ConsumerAdmin;
-class TAO_NS_SupplierAdmin;
-class TAO_NS_Proxy;
-class TAO_NS_Consumer;
-class TAO_NS_Supplier;
-class TAO_NS_Peer;
+class TAO_Notify_Object;
+class TAO_Notify_EventChannelFactory;
+class TAO_Notify_EventChannel;
+class TAO_Notify_SupplierAdmin;
+class TAO_Notify_ConsumerAdmin;
+class TAO_Notify_ProxyPushConsumer;
+class TAO_Notify_CosEC_ProxyPushSupplier;
+class TAO_Notify_CosEC_ProxyPushConsumer;
+class TAO_Notify_ProxyPushSupplier;
+class TAO_Notify_StructuredProxyPushConsumer;
+class TAO_Notify_StructuredProxyPushSupplier;
+class TAO_Notify_SequenceProxyPushConsumer;
+class TAO_Notify_SequenceProxyPushSupplier;
+class TAO_Notify_ProxyConsumer;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_ConsumerAdmin;
+class TAO_Notify_SupplierAdmin;
+class TAO_Notify_Proxy;
+class TAO_Notify_Consumer;
+class TAO_Notify_Supplier;
+class TAO_Notify_Peer;
 
 template <class PROXY> class TAO_ESF_Proxy_Collection;
 
-typedef TAO_ESF_Proxy_Collection<TAO_NS_ProxyConsumer> TAO_NS_ProxyConsumer_Collection;
-typedef TAO_ESF_Proxy_Collection<TAO_NS_ProxySupplier> TAO_NS_ProxySupplier_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_ProxyConsumer> TAO_Notify_ProxyConsumer_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_ProxySupplier> TAO_Notify_ProxySupplier_Collection;
 
-typedef TAO_ESF_Proxy_Collection<TAO_NS_EventChannel> TAO_NS_EventChannel_Collection;
-typedef TAO_ESF_Proxy_Collection<TAO_NS_ConsumerAdmin> TAO_NS_ConsumerAdmin_Collection;
-typedef TAO_ESF_Proxy_Collection<TAO_NS_SupplierAdmin> TAO_NS_SupplierAdmin_Collection;
-typedef TAO_ESF_Proxy_Collection<TAO_NS_Proxy> TAO_NS_Proxy_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_Notify_Proxy> TAO_Notify_Proxy_Collection;
 
 /**
- * @class TAO_NS_Factory
+ * @class TAO_Notify_Factory
  *
  * @brief Factory interface for creating Notify Objects.
  *
  */
-class /*TAO_Notify_Export*/ TAO_NS_Factory : public ACE_Service_Object
+class /*TAO_Notify_Export*/ TAO_Notify_Factory : public ACE_Service_Object
 {
 public:
   /// Create ProxySupplier Collection
-  virtual void create (TAO_NS_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_NS_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create EventChannel Collection
-  virtual void create (TAO_NS_EventChannel_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_NS_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_NS_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create Proxy Collection
-  virtual void create (TAO_NS_Proxy_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL) = 0;
 
   /// Create EventChannelFactory
-  virtual void create (TAO_NS_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL) = 0;
 
   /// Create EventChannel
-  virtual void create (TAO_NS_EventChannel*& channel ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL) = 0;
 
   /// Create SupplierAdmin
-  virtual void create (TAO_NS_SupplierAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL) = 0;
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_NS_ConsumerAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL) = 0;
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_NS_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_NS_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_NS_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_NS_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_NS_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_NS_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_NS_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_NS_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_FACTORY_H */
+#endif /* TAO_Notify_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 5268f76e2b3..d6b64275843 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -11,17 +11,17 @@ ACE_RCSID(Notify, FilterAdmin, "$Id$")
 #include "ace/Refcounted_Auto_Ptr.h"
 
 // Implementation skeleton constructor
-TAO_NS_FilterAdmin::TAO_NS_FilterAdmin (void)
+TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void)
 {
 }
 
 // Implementation skeleton destructor
-TAO_NS_FilterAdmin::~TAO_NS_FilterAdmin (void)
+TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void)
 {
 }
 
 CosNotifyFilter::FilterID
-TAO_NS_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (new_filter))
@@ -44,7 +44,7 @@ TAO_NS_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_A
 }
 
 void
-TAO_NS_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -59,7 +59,7 @@ TAO_NS_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_A
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NS_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -80,7 +80,7 @@ TAO_NS_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -118,7 +118,7 @@ TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_FilterAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 9c0c2a52d3f..22c5cbb36e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -20,24 +20,24 @@
 #include "notify_export.h"
 
 /**
- * @class TAO_NS_FilterAdmin
+ * @class TAO_Notify_FilterAdmin
  *
  * @brief FilterAdmin interface methods implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_FilterAdmin
+class TAO_Notify_Export TAO_Notify_FilterAdmin
 {
 
  public:
   /// Constructor
-  TAO_NS_FilterAdmin (void);
+  TAO_Notify_FilterAdmin (void);
 
   /// Destructor
-  virtual ~TAO_NS_FilterAdmin (void);
+  virtual ~TAO_Notify_FilterAdmin (void);
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_NS_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -86,7 +86,7 @@ class TAO_Notify_Export TAO_NS_FilterAdmin
   FILTER_LIST filter_list_;
 
   /// Id generator for proxy suppliers
-  TAO_NS_ID_Factory filter_ids_;
+  TAO_Notify_ID_Factory filter_ids_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index a8c46da4aa6..52627546951 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -1,7 +1,7 @@
 //$Id$
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_FilterAdmin::match (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index 27708b31cd9..0f28693df85 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_FILTERFACTORY_H
-#define TAO_NS_FILTERFACTORY_H
+#ifndef TAO_Notify_FILTERFACTORY_H
+#define TAO_Notify_FILTERFACTORY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,12 +23,12 @@
 #include "tao/PortableServer/PortableServer.h"
 
 /**
- * @class TAO_NS_FilterFactory
+ * @class TAO_Notify_FilterFactory
  *
  * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference.
  *
  */
-class /*TAO_Notify_Export*/ TAO_NS_FilterFactory : public ACE_Service_Object
+class /*TAO_Notify_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object
 {
 public:
   /// Factory method to create a FilterFactory reference
@@ -37,4 +37,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_FILTERFACTORY_H */
+#endif /* TAO_Notify_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index 4e1e9b102b7..3adfc211d53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_FIND_WORKER_T_CPP
-#define TAO_NS_FIND_WORKER_T_CPP
+#ifndef TAO_Notify_FIND_WORKER_T_CPP
+#define TAO_Notify_FIND_WORKER_T_CPP
 
 #include "Find_Worker_T.h"
 
@@ -9,16 +9,16 @@
 #include "Find_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Find_Worker_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Find_Worker_T, "$Id$")
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
-TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_NS_Find_Worker_T (void)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Find_Worker_T (void)
   :id_ (0), result_ (0)
 {
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TYPE*
-TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (TAO_NS_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
 {
   this->id_ = id;
 
@@ -29,7 +29,7 @@ TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (TAO_NS_Objec
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTERFACE_PTR
-TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (TAO_NS_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
 {
   this->find (id, container ACE_ENV_ARG_PARAMETER);
 
@@ -44,4 +44,4 @@ TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (TAO_NS_Ob
 
 }
 
-#endif /* TAO_NS_FIND_WORKER_T_CPP */
+#endif /* TAO_Notify_FIND_WORKER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index 172b64c2b56..10aafd0b757 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_FIND_WORKER_T_H
-#define TAO_NS_FIND_WORKER_T_H
+#ifndef TAO_Notify_FIND_WORKER_T_H
+#define TAO_Notify_FIND_WORKER_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,33 +24,33 @@
 #include "Container_T.h"
 
 /**
- * @class TAO_NS_Find_Worker_T
+ * @class TAO_Notify_Find_Worker_T
  *
  * @brief Helper to locate a TYPE given its ID.
  *
  */
 template <class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION>
-class TAO_Notify_Export TAO_NS_Find_Worker_T : public TAO_ESF_Worker<TYPE>
+class TAO_Notify_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE>
 {
-  typedef TAO_NS_Container_T<TYPE> CONTAINER;
+  typedef TAO_Notify_Container_T<TYPE> CONTAINER;
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
 
 public:
   /// Constructor
-  TAO_NS_Find_Worker_T (void);
+  TAO_Notify_Find_Worker_T (void);
 
   /// Find the Type.
-  TYPE* find (TAO_NS_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  TYPE* find (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
 
   /// Find and resolve to the Interface.
-  INTERFACE_PTR resolve (TAO_NS_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  INTERFACE_PTR resolve (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
 
 protected:
   ///= TAO_ESF_Worker method
   void work (TYPE* object ACE_ENV_ARG_DECL);
 
   /// The id we're looking for.
-  TAO_NS_Object::ID id_;
+  TAO_Notify_Object::ID id_;
 
   /// The result
   TYPE* result_;
@@ -69,4 +69,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_FIND_WORKER_T_H */
+#endif /* TAO_Notify_FIND_WORKER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
index b93dd01c819..04d4252383f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void
-TAO_NS_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (type->id () == this->id_)
     this->result_ = type;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index 42eb0bac2a8..8e021520caf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -6,12 +6,12 @@
 #include "ID_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ID_Factory, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$")
 
-TAO_NS_ID_Factory::TAO_NS_ID_Factory (void)
+TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
 {
 }
 
-TAO_NS_ID_Factory::~TAO_NS_ID_Factory ()
+TAO_Notify_ID_Factory::~TAO_Notify_ID_Factory ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index 21a0136b7ba..9fa05c57ca9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ID_FACTORY_H
-#define TAO_NS_ID_FACTORY_H
+#ifndef TAO_Notify_ID_FACTORY_H
+#define TAO_Notify_ID_FACTORY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,24 +23,24 @@
 #include "Object.h"
 
 /**
- * @class TAO_NS_ID_Factory
+ * @class TAO_Notify_ID_Factory
  *
  * @brief A simple factory for generating ID's for objects created by Notify.
  *
  */
-class TAO_Notify_Export TAO_NS_ID_Factory
+class TAO_Notify_Export TAO_Notify_ID_Factory
 {
 public:
   /// Constuctor
-  TAO_NS_ID_Factory (void);
+  TAO_Notify_ID_Factory (void);
 
   /// Destructor
-  ~TAO_NS_ID_Factory ();
+  ~TAO_Notify_ID_Factory ();
 
-  TAO_NS_Object::ID id (void);
+  TAO_Notify_Object::ID id (void);
 
 private:
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, TAO_NS_Object::ID> seed_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, TAO_Notify_Object::ID> seed_;
 };
 
 
@@ -49,4 +49,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ID_FACTORY_H */
+#endif /* TAO_Notify_ID_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
index 3520fc9bb7a..74a2d8582d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -1,7 +1,7 @@
 // $Id$
 
-ACE_INLINE TAO_NS_Object::ID
-TAO_NS_ID_Factory::id (void)
+ACE_INLINE TAO_Notify_Object::ID
+TAO_Notify_ID_Factory::id (void)
 {
   return ++seed_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index 5744f534186..56fd8d589e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -6,4 +6,4 @@
 #include "Method_Request.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 3f1f404e823..44ca787872b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_H
-#define TAO_NS_METHOD_REQUEST_H
+#ifndef TAO_Notify_METHOD_REQUEST_H
+#define TAO_Notify_METHOD_REQUEST_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,38 +23,38 @@
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "Event.h"
 
-class TAO_NS_Method_Request;
+class TAO_Notify_Method_Request;
 
 /**
- * @class TAO_NS_Method_Request_No_Copy
+ * @class TAO_Notify_Method_Request_No_Copy
  *
  * @brief Base class for Method Requests that do not copy the event.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 /***********************************************************************/
 
 /**
- * @class TAO_NS_Method_Request
+ * @class TAO_Notify_Method_Request
  *
  * @brief Interface for NS method Requests
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request : public ACE_Message_Block
+class TAO_Notify_Export TAO_Notify_Method_Request : public ACE_Message_Block
 {
 public:
   enum {PRIORITY_BASE = 32768};
 
-  void init (const TAO_NS_Event_var& event);
+  void init (const TAO_Notify_Event_var& event);
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
@@ -65,4 +65,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_H */
+#endif /* TAO_Notify_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
index e015902690b..c35b4bc7446 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 ACE_INLINE void
-TAO_NS_Method_Request::init (const TAO_NS_Event_var& event)
+TAO_Notify_Method_Request::init (const TAO_Notify_Event_var& event)
 {
   // Set the parameters that affect queuing in the message queue.
   // The ACE_Message_Block priorities go from 0 (lowest) to ULONG_MAX
@@ -19,7 +19,7 @@ TAO_NS_Method_Request::init (const TAO_NS_Event_var& event)
   // timeout for the event is relative to the time it was received.
   // So, we do a little conversion and set it on the message block (us)
 
-  const TAO_NS_Property_Time& timeout = event->timeout ();
+  const TAO_Notify_Property_Time& timeout = event->timeout ();
 
   if (timeout.is_valid () && timeout != 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index f52cc1f11a0..4322dbc6f29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -6,7 +6,7 @@
 #include "Method_Request_Dispatch.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Dispatch, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 
 #include "tao/debug.h"
 #include "ProxySupplier.h"
@@ -14,51 +14,51 @@ ACE_RCSID(Notify, TAO_NS_Method_Request_Dispatch, "$Id$")
 #include "Admin.h"
 #include "ConsumerAdmin.h"
 
-TAO_NS_Method_Request_Dispatch::TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_NS_Method_Request_Dispatch_Base (event, proxy_supplier, filtering)
+TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_Notify_Method_Request_Dispatch_Base (event, proxy_supplier, filtering)
 {
   this->init (event);
 }
 
-TAO_NS_Method_Request_Dispatch::~TAO_NS_Method_Request_Dispatch ()
+TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
 {
 }
 
 int
-TAO_NS_Method_Request_Dispatch::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /*********************************************************************************************************/
 
-TAO_NS_Method_Request_Dispatch_No_Copy::TAO_NS_Method_Request_Dispatch_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_NS_Method_Request_Dispatch_No_Copy_Base (event, proxy_supplier, filtering)
+TAO_Notify_Method_Request_Dispatch_No_Copy::TAO_Notify_Method_Request_Dispatch_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_Notify_Method_Request_Dispatch_No_Copy_Base (event, proxy_supplier, filtering)
 {
 }
 
-TAO_NS_Method_Request_Dispatch_No_Copy:: ~TAO_NS_Method_Request_Dispatch_No_Copy ()
+TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch_No_Copy ()
 {
 }
 
 int
-TAO_NS_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Method_Request* request;
+  TAO_Notify_Method_Request* request;
 
-  TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  TAO_NS_Event_Copy_var event_var (event_copy);
+  TAO_Notify_Event_Copy_var event_var (event_copy);
 
   ACE_NEW_THROW_EX (request,
-                    TAO_NS_Method_Request_Dispatch (event_var, this->proxy_supplier_, this->filtering_),
+                    TAO_Notify_Method_Request_Dispatch (event_var, this->proxy_supplier_, this->filtering_),
                     CORBA::INTERNAL ());
 
   return request;
@@ -66,28 +66,28 @@ TAO_NS_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 
 /*********************************************************************************************************/
 
-TAO_NS_Method_Request_Dispatch_No_Copy_Ex::TAO_NS_Method_Request_Dispatch_No_Copy_Ex (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base (event, proxy_supplier, filtering)
+TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::TAO_Notify_Method_Request_Dispatch_No_Copy_Ex (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base (event, proxy_supplier, filtering)
 {
 }
 
-TAO_NS_Method_Request_Dispatch_No_Copy_Ex:: ~TAO_NS_Method_Request_Dispatch_No_Copy_Ex ()
+TAO_Notify_Method_Request_Dispatch_No_Copy_Ex:: ~TAO_Notify_Method_Request_Dispatch_No_Copy_Ex ()
 {
 }
 
 int
-TAO_NS_Method_Request_Dispatch_No_Copy_Ex::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Dispatch_No_Copy_Ex::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Method_Request* request;
+  TAO_Notify_Method_Request* request;
 
   ACE_NEW_THROW_EX (request,
-                    TAO_NS_Method_Request_Dispatch (this->event_, this->proxy_supplier_, this->filtering_),
+                    TAO_Notify_Method_Request_Dispatch (this->event_, this->proxy_supplier_, this->filtering_),
                     CORBA::INTERNAL ());
 
   return request;
@@ -97,36 +97,36 @@ TAO_NS_Method_Request_Dispatch_No_Copy_Ex::copy (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
-, TAO_NS_ProxySupplier_Guard
-, const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*>;
+template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
+, TAO_Notify_ProxySupplier_Guard
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*>;
 
-template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
-, TAO_NS_ProxySupplier*
-, const TAO_NS_Event*
-, TAO_NS_ProxySupplier*>;
+template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
+, TAO_Notify_ProxySupplier*
+, const TAO_Notify_Event*
+, TAO_Notify_ProxySupplier*>;
 
-template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*
-, const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*>;
+template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
-, TAO_NS_ProxySupplier_Guard
-, const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*>
+#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
+, TAO_Notify_ProxySupplier_Guard
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*>
 
-#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
-, TAO_NS_ProxySupplier*
-, const TAO_NS_Event*
-, TAO_NS_ProxySupplier*>
+#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
+, TAO_Notify_ProxySupplier*
+, const TAO_Notify_Event*
+, TAO_Notify_ProxySupplier*>
 
-#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*
-, const TAO_NS_Event_var&
-, TAO_NS_ProxySupplier*>
+#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxySupplier*>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 3b484b4c891..609775e05a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_DISPATCH_METHOD_REQUEST_H
-#define TAO_NS_DISPATCH_METHOD_REQUEST_H
+#ifndef TAO_Notify_DISPATCH_METHOD_REQUEST_H
+#define TAO_Notify_DISPATCH_METHOD_REQUEST_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,26 +25,26 @@
 #include "ProxySupplier.h"
 
 /**
- * @class TAO_NS_Method_Request_Dispatch
+ * @class TAO_Notify_Method_Request_Dispatch
  *
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
 
-typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
-                                         , TAO_NS_ProxySupplier_Guard
-                                         , const TAO_NS_Event_var&
-                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_Base;
+typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
+                                         , TAO_Notify_ProxySupplier_Guard
+                                         , const TAO_Notify_Event_var&
+                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_Base;
 
-class TAO_Notify_Export TAO_NS_Method_Request_Dispatch : public TAO_NS_Method_Request_Dispatch_Base
-                                                       , public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base
+                                                       , public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  TAO_Notify_Method_Request_Dispatch (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Dispatch ();
+  ~TAO_Notify_Method_Request_Dispatch ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -53,63 +53,63 @@ public:
 /*******************************************************************************************************/
 
 /**
- * @class TAO_NS_Method_Request_Dispatch_No_Copy
+ * @class TAO_Notify_Method_Request_Dispatch_No_Copy
  *
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
 
-typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
-                                         , TAO_NS_ProxySupplier*
-                                         , const TAO_NS_Event*
-                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_No_Copy_Base;
+typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
+                                         , TAO_Notify_ProxySupplier*
+                                         , const TAO_Notify_Event*
+                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Base;
 
-class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_No_Copy : public TAO_NS_Method_Request_Dispatch_No_Copy_Base
-                                                                 , public TAO_NS_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base
+                                                                 , public TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Dispatch_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  TAO_Notify_Method_Request_Dispatch_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Dispatch_No_Copy ();
+  ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 /*******************************************************************************************************/
 
 /**
- * @class TAO_NS_Method_Request_Dispatch_No_Copy_Ex
+ * @class TAO_Notify_Method_Request_Dispatch_No_Copy_Ex
  *
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
 
-typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
-                                         , TAO_NS_ProxySupplier*
-                                         , const TAO_NS_Event_var&
-                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base;
+typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
+                                         , TAO_Notify_ProxySupplier*
+                                         , const TAO_Notify_Event_var&
+                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base;
 
-class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_No_Copy_Ex : public TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base
-                                                                 , public TAO_NS_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base
+                                                                 , public TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Dispatch_No_Copy_Ex (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Dispatch_No_Copy_Ex ();
+  ~TAO_Notify_Method_Request_Dispatch_No_Copy_Ex ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
@@ -117,4 +117,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_DISPATCH_METHOD_REQUEST_H */
+#endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
index 07a8a2b78d4..d096144ca85 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Method_Request_Dispatch_T_CPP
-#define TAO_NS_Method_Request_Dispatch_T_CPP
+#ifndef TAO_Notify_Method_Request_Dispatch_T_CPP
+#define TAO_Notify_Method_Request_Dispatch_T_CPP
 
 #include "Method_Request_Dispatch_T.h"
 
@@ -8,17 +8,17 @@
 #include "Method_Request_Dispatch_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Dispatch_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch_T, "$id$")
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy_supplier, CORBA::Boolean filtering)
+TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy_supplier, CORBA::Boolean filtering)
   :event_ (event), proxy_supplier_ (proxy_supplier), filtering_ (filtering)
 {
 }
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Dispatch_T ()
+TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_Notify_Method_Request_Dispatch_T ()
 {
 }
 
-#endif /* TAO_NS_Method_Request_Dispatch_T_CPP */
+#endif /* TAO_Notify_Method_Request_Dispatch_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
index 48a5582db50..96eecd4ec65 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_DISPATCH_T_H
-#define TAO_NS_METHOD_REQUEST_DISPATCH_T_H
+#ifndef TAO_Notify_METHOD_REQUEST_DISPATCH_T_H
+#define TAO_Notify_METHOD_REQUEST_DISPATCH_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,20 +22,20 @@
 #include "tao/corba.h"
 
 /**
- * @class TAO_NS_Method_Request_Dispatch_T
+ * @class TAO_Notify_Method_Request_Dispatch_T
  *
  * @brief
  *
  */
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_T
+class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_T
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy, CORBA::Boolean filtering);
+  TAO_Notify_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy, CORBA::Boolean filtering);
 
   /// Destructor
-  virtual ~TAO_NS_Method_Request_Dispatch_T ();
+  virtual ~TAO_Notify_Method_Request_Dispatch_T ();
 
   /// Execute the dispatch operation.
   int execute_i (ACE_ENV_SINGLE_ARG_DECL);
@@ -64,4 +64,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_DISPATCH_T_H */
+#endif /* TAO_Notify_METHOD_REQUEST_DISPATCH_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
index 0ca8a208db9..10cfecb6efa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
@@ -3,14 +3,14 @@
 #include "Admin.h"
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->proxy_supplier_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
 
   if (this->filtering_ == 1)
     {
-      TAO_NS_Admin* parent = this->proxy_supplier_->consumer_admin ();
+      TAO_Notify_Admin* parent = this->proxy_supplier_->consumer_admin ();
 
       CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
                                                                   parent->filter_admin (),
@@ -27,7 +27,7 @@ TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execut
 
   ACE_TRY
     {
-      TAO_NS_Consumer* consumer = this->proxy_supplier_->consumer ();
+      TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer ();
 
       if (consumer != 0)
         {
@@ -38,7 +38,7 @@ TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execut
   ACE_CATCHANY
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Dispatch::: error sending event. \n ");
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Notify_Method_Request_Dispatch::: error sending event. \n ");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 37445904795..ba734c47dd3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -6,25 +6,25 @@
 #include "Method_Request_Event.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Event, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Event, "$id$")
 
-TAO_NS_Method_Request_Event::TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event)
+TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (const TAO_Notify_Event_var& event)
   :event_ (event)
 {
   this->init (event);
 }
 
-TAO_NS_Method_Request_Event::~TAO_NS_Method_Request_Event ()
+TAO_Notify_Method_Request_Event::~TAO_Notify_Method_Request_Event ()
 {
 }
 int
-TAO_NS_Method_Request_Event::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Event::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return -1;
 }
 
-const TAO_NS_Event_var&
-TAO_NS_Method_Request_Event::event (void)
+const TAO_Notify_Event_var&
+TAO_Notify_Method_Request_Event::event (void)
 {
   return this->event_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 7ed65552474..499b970337f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_EVENT_H
-#define TAO_NS_METHOD_REQUEST_EVENT_H
+#ifndef TAO_Notify_METHOD_REQUEST_EVENT_H
+#define TAO_Notify_METHOD_REQUEST_EVENT_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,29 +22,29 @@
 #include "Method_Request.h"
 
 /**
- * @class TAO_NS_Method_Request_Event
+ * @class TAO_Notify_Method_Request_Event
  *
  * @brief A method request for storing events.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Event : public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event);
+  TAO_Notify_Method_Request_Event (const TAO_Notify_Event_var& event);
 
   /// Destructor
-  virtual ~TAO_NS_Method_Request_Event ();
+  virtual ~TAO_Notify_Method_Request_Event ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain the event.
-  const TAO_NS_Event_var& event (void);
+  const TAO_Notify_Event_var& event (void);
 
 protected:
   /// The event.
-  const TAO_NS_Event_var event_;
+  const TAO_Notify_Event_var event_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -52,4 +52,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_EVENT_H */
+#endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index d876beafbb6..a99adabdb47 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -6,7 +6,7 @@
 #include "Method_Request_Lookup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Lookup, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 
 #include "tao/debug.h"
 #include "Consumer_Map.h"
@@ -16,51 +16,51 @@ ACE_RCSID(Notify, TAO_NS_Method_Request_Lookup, "$Id$")
 #include "Admin.h"
 #include "SupplierAdmin.h"
 
-TAO_NS_Method_Request_Lookup::TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer)
-  : TAO_NS_Method_Request_Lookup_Base (event, proxy_consumer)
+TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event_var& event, TAO_Notify_ProxyConsumer* proxy_consumer)
+  : TAO_Notify_Method_Request_Lookup_Base (event, proxy_consumer)
 {
   this->init (event);
 }
 
-TAO_NS_Method_Request_Lookup::~TAO_NS_Method_Request_Lookup ()
+TAO_Notify_Method_Request_Lookup::~TAO_Notify_Method_Request_Lookup ()
 {
 }
 
 int
-TAO_NS_Method_Request_Lookup::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /******************************************************************************************************/
 
-TAO_NS_Method_Request_Lookup_No_Copy::TAO_NS_Method_Request_Lookup_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxyConsumer* proxy_consumer)
-  : TAO_NS_Method_Request_Lookup_No_Copy_Base (event, proxy_consumer)
+TAO_Notify_Method_Request_Lookup_No_Copy::TAO_Notify_Method_Request_Lookup_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxyConsumer* proxy_consumer)
+  : TAO_Notify_Method_Request_Lookup_No_Copy_Base (event, proxy_consumer)
 {
 }
 
-TAO_NS_Method_Request_Lookup_No_Copy::~TAO_NS_Method_Request_Lookup_No_Copy ()
+TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_Copy ()
 {
 }
 
 int
-TAO_NS_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Method_Request* request;
+  TAO_Notify_Method_Request* request;
 
-  TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  TAO_NS_Event_Copy_var event_var (event_copy);
+  TAO_Notify_Event_Copy_var event_var (event_copy);
 
   ACE_NEW_THROW_EX (request,
-                    TAO_NS_Method_Request_Lookup (event_var, this->proxy_consumer_),
+                    TAO_Notify_Method_Request_Lookup (event_var, this->proxy_consumer_),
                     CORBA::INTERNAL ());
 
   return request;
@@ -68,26 +68,26 @@ TAO_NS_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
-, TAO_NS_ProxyConsumer_Guard
-, const TAO_NS_Event_var&
-, TAO_NS_ProxyConsumer*>;
+template class TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
+, TAO_Notify_ProxyConsumer_Guard
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxyConsumer*>;
 
-template class TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
-, TAO_NS_ProxyConsumer*
-, const TAO_NS_Event*
-, TAO_NS_ProxyConsumer*>;
+template class TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
+, TAO_Notify_ProxyConsumer*
+, const TAO_Notify_Event*
+, TAO_Notify_ProxyConsumer*>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
-, TAO_NS_ProxyConsumer_Guard
-, const TAO_NS_Event_var&
-, TAO_NS_ProxyConsumer*>
+#pragma instantiate TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
+, TAO_Notify_ProxyConsumer_Guard
+, const TAO_Notify_Event_var&
+, TAO_Notify_ProxyConsumer*>
 
-#pragma instantiate TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
-, TAO_NS_ProxyConsumer*
-, const TAO_NS_Event*
-, TAO_NS_ProxyConsumer*>
+#pragma instantiate TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
+, TAO_Notify_ProxyConsumer*
+, const TAO_Notify_Event*
+, TAO_Notify_ProxyConsumer*>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 8aa5af10287..0a9b321a144 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_LOOKUP_METHOD_REQUEST_H
-#define TAO_NS_LOOKUP_METHOD_REQUEST_H
+#ifndef TAO_Notify_LOOKUP_METHOD_REQUEST_H
+#define TAO_Notify_LOOKUP_METHOD_REQUEST_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,28 +25,28 @@
 #include "Consumer_Map.h"
 #include "Method_Request_Lookup_T.h"
 
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
-typedef TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
-                                       , TAO_NS_ProxyConsumer_Guard
-                                       , const TAO_NS_Event_var&
-                                       , TAO_NS_ProxyConsumer*>  TAO_NS_Method_Request_Lookup_Base;
+typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
+                                       , TAO_Notify_ProxyConsumer_Guard
+                                       , const TAO_Notify_Event_var&
+                                       , TAO_Notify_ProxyConsumer*>  TAO_Notify_Method_Request_Lookup_Base;
 
 /**
- * @class TAO_NS_Method_Request_Lookup
+ * @class TAO_Notify_Method_Request_Lookup
  *
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Lookup : public TAO_NS_Method_Request_Lookup_Base
-                                                       , public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base
+                                                       , public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer);
+  TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event_var& event, TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Lookup ();
+  ~TAO_Notify_Method_Request_Lookup ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -54,32 +54,32 @@ public:
 
 /*****************************************************************************************************************************/
 
-typedef TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
-                                       , TAO_NS_ProxyConsumer*
-                                       , const TAO_NS_Event*
-                                       , TAO_NS_ProxyConsumer*>  TAO_NS_Method_Request_Lookup_No_Copy_Base;
+typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
+                                       , TAO_Notify_ProxyConsumer*
+                                       , const TAO_Notify_Event*
+                                       , TAO_Notify_ProxyConsumer*>  TAO_Notify_Method_Request_Lookup_No_Copy_Base;
 
 /**
- * @class TAO_NS_Method_Request_Lookup_No_Copy
+ * @class TAO_Notify_Method_Request_Lookup_No_Copy
  *
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Lookup_No_Copy : public TAO_NS_Method_Request_Lookup_No_Copy_Base
-                                                               , public TAO_NS_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base
+                                                               , public TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Lookup_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxyConsumer* proxy_consumer);
+  TAO_Notify_Method_Request_Lookup_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Lookup_No_Copy ();
+  ~TAO_Notify_Method_Request_Lookup_No_Copy ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
@@ -87,4 +87,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_LOOKUP_METHOD_REQUEST_H */
+#endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
index bf9f1220aa9..723a2879d88 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Method_Request_Lookup_T_CPP
-#define TAO_NS_Method_Request_Lookup_T_CPP
+#ifndef TAO_Notify_Method_Request_Lookup_T_CPP
+#define TAO_Notify_Method_Request_Lookup_T_CPP
 
 #include "Method_Request_Lookup_T.h"
 
@@ -8,24 +8,24 @@
 #include "Method_Request_Lookup_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Lookup_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup_T, "$id$")
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy_consumer)
+TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy_consumer)
   :event_ (event), proxy_consumer_ (proxy_consumer)
 {
 }
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Lookup_T ()
+TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_Notify_Method_Request_Lookup_T ()
 {
 }
 
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> void
-TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
 {
   proxy_supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
-#endif /* TAO_NS_Method_Request_Lookup_T_CPP */
+#endif /* TAO_Notify_Method_Request_Lookup_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
index 607f1d09c0c..7f942e6d6e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_LOOKUP_T_H
-#define TAO_NS_METHOD_REQUEST_LOOKUP_T_H
+#ifndef TAO_Notify_METHOD_REQUEST_LOOKUP_T_H
+#define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,27 +23,27 @@
 #include "ProxySupplier.h"
 
 /**
- * @class TAO_NS_Method_Request_Lookup_T
+ * @class TAO_Notify_Method_Request_Lookup_T
  *
  * @brief
  *
  */
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-class TAO_Notify_Export TAO_NS_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_NS_ProxySupplier>
+class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy);
+  TAO_Notify_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy);
 
   /// Destructor
-  virtual ~TAO_NS_Method_Request_Lookup_T ();
+  virtual ~TAO_Notify_Method_Request_Lookup_T ();
 
   /// Execute the dispatch operation.
   int execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   ///= TAO_ESF_Worker method
-  virtual void work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
 
   /// The Event
   EVENT event_;
@@ -65,4 +65,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_LOOKUP_T_H */
+#endif /* TAO_Notify_METHOD_REQUEST_LOOKUP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
index 1af1a467b7b..ba26ca0930e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
@@ -3,12 +3,12 @@
 #include "Event_Manager.h"
 
 template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->proxy_consumer_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
 
-  TAO_NS_Admin* parent = this->proxy_consumer_->supplier_admin ();
+  TAO_Notify_Admin* parent = this->proxy_consumer_->supplier_admin ();
 
   CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
                                                              parent->filter_admin (),
@@ -23,12 +23,12 @@ TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_
     return 0;
 
   // The map of subscriptions.
-  TAO_NS_Consumer_Map* map = this->proxy_consumer_->event_manager ()->consumer_map ();
+  TAO_Notify_Consumer_Map* map = this->proxy_consumer_->event_manager ()->consumer_map ();
 
-  TAO_NS_Consumer_Map::ENTRY* entry = map->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Consumer_Map::ENTRY* entry = map->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  TAO_NS_ProxySupplier_Collection* consumers = 0;
+  TAO_Notify_ProxySupplier_Collection* consumers = 0;
 
   if (entry != 0)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index db6d4335d50..f0d82aee866 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -7,25 +7,25 @@
 #include "Method_Request_Shutdown.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Shutdown, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$")
 
-TAO_NS_Method_Request_Shutdown::TAO_NS_Method_Request_Shutdown (TAO_NS_ThreadPool_Task* task)
+TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task)
   : task_ (task)
 {
 }
 
-TAO_NS_Method_Request_Shutdown::~TAO_NS_Method_Request_Shutdown ()
+TAO_Notify_Method_Request_Shutdown::~TAO_Notify_Method_Request_Shutdown ()
 {
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Shutdown::copy (void)
+TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Shutdown::copy (void)
 {
-  return new TAO_NS_Method_Request_Shutdown (this->task_);
+  return new TAO_Notify_Method_Request_Shutdown (this->task_);
 }
 
 int
-TAO_NS_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Shut down the scheduler by deactivating the activation queue's
   // underlying message queue - should pop all worker threads off their
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index 433dea36e51..3bc8f4f91fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_SHUTDOWN_H
-#define TAO_NS_METHOD_REQUEST_SHUTDOWN_H
+#ifndef TAO_Notify_METHOD_REQUEST_SHUTDOWN_H
+#define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -21,32 +21,32 @@
 
 #include "Method_Request.h"
 
-class TAO_NS_ThreadPool_Task;
+class TAO_Notify_ThreadPool_Task;
 
 /**
- * @class TAO_NS_Method_Request_Shutdown
+ * @class TAO_Notify_Method_Request_Shutdown
  *
  * @brief Shutdown message for the ThreadPool_Task
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Shutdown : public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Shutdown (TAO_NS_ThreadPool_Task* task);
+  TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Shutdown ();
+  ~TAO_Notify_Method_Request_Shutdown ();
 
   /// Create a copy of this object.
-  TAO_NS_Method_Request* copy (void);
+  TAO_Notify_Method_Request* copy (void);
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   // Task to shutdown
-  TAO_NS_ThreadPool_Task* task_;
+  TAO_Notify_ThreadPool_Task* task_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -54,4 +54,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_SHUTDOWN_H */
+#endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 26633a89aff..231af05e8d2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -6,83 +6,83 @@
 #include "Method_Request_Updates.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Updates, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
 
 #include "tao/debug.h"
 #include "Proxy.h"
 #include "Peer.h"
 
-TAO_NS_Method_Request_Updates::TAO_NS_Method_Request_Updates (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy)
-  : TAO_NS_Method_Request_Updates_Base (added, removed, proxy)
+TAO_Notify_Method_Request_Updates::TAO_Notify_Method_Request_Updates (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy)
+  : TAO_Notify_Method_Request_Updates_Base (added, removed, proxy)
 {
 }
 
-TAO_NS_Method_Request_Updates::~TAO_NS_Method_Request_Updates ()
+TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates ()
 {
 }
 
 int
-TAO_NS_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /********************************************************************************************************/
 
-TAO_NS_Method_Request_Updates_No_Copy::TAO_NS_Method_Request_Updates_No_Copy (const TAO_NS_EventTypeSeq& added
-                                                                              , const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy)
-  : TAO_NS_Method_Request_Updates_No_Copy_Base (added, removed, proxy)
+TAO_Notify_Method_Request_Updates_No_Copy::TAO_Notify_Method_Request_Updates_No_Copy (const TAO_Notify_EventTypeSeq& added
+                                                                              , const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy)
+  : TAO_Notify_Method_Request_Updates_No_Copy_Base (added, removed, proxy)
 {
 }
 
-TAO_NS_Method_Request_Updates_No_Copy::~TAO_NS_Method_Request_Updates_No_Copy ()
+TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No_Copy ()
 {
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Method_Request* request;
+  TAO_Notify_Method_Request* request;
 
   ACE_NEW_THROW_EX (request,
-                    TAO_NS_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
+                    TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
                     CORBA::INTERNAL ());
 
   return request;
 }
 
 int
-TAO_NS_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
-, TAO_NS_Proxy_Guard
-, const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
+template class TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
+, TAO_Notify_Proxy_Guard
+, const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
 >;
 
-template class TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
-, const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
+template class TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
+, const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
 >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
-, TAO_NS_Proxy_Guard
-, const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
+#pragma instantiate TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
+, TAO_Notify_Proxy_Guard
+, const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
 >
 
-#pragma instantiate TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
-, const TAO_NS_EventTypeSeq&
-, TAO_NS_Proxy*
+#pragma instantiate TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
+, const TAO_Notify_EventTypeSeq&
+, TAO_Notify_Proxy*
 >
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index 9ff84646784..856e099f9fd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_UPDATES_H
-#define TAO_NS_METHOD_REQUEST_UPDATES_H
+#ifndef TAO_Notify_METHOD_REQUEST_UPDATES_H
+#define TAO_Notify_METHOD_REQUEST_UPDATES_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,27 +24,27 @@
 #include "EventTypeSeq.h"
 #include "Proxy.h"
 
-typedef TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
-                                        , TAO_NS_Proxy_Guard
-                                        , const TAO_NS_EventTypeSeq&
-                                        , TAO_NS_Proxy*
-                                        > TAO_NS_Method_Request_Updates_Base;
+typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
+                                        , TAO_Notify_Proxy_Guard
+                                        , const TAO_Notify_EventTypeSeq&
+                                        , TAO_Notify_Proxy*
+                                        > TAO_Notify_Method_Request_Updates_Base;
 
 /**
- * @class TAO_NS_Method_Request_Updates
+ * @class TAO_Notify_Method_Request_Updates
  *
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Updates : public TAO_NS_Method_Request_Updates_Base
-                                                        ,public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
+                                                        ,public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Updates (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy);
+  TAO_Notify_Method_Request_Updates (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Updates ();
+  ~TAO_Notify_Method_Request_Updates ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -52,30 +52,30 @@ public:
 
 /***********************************************************************************************************************/
 
-typedef TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
-                                        , TAO_NS_Proxy*
-                                        , const TAO_NS_EventTypeSeq&
-                                        , TAO_NS_Proxy*
-                                        > TAO_NS_Method_Request_Updates_No_Copy_Base;
+typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
+                                        , TAO_Notify_Proxy*
+                                        , const TAO_Notify_EventTypeSeq&
+                                        , TAO_Notify_Proxy*
+                                        > TAO_Notify_Method_Request_Updates_No_Copy_Base;
 
 /**
- * @class TAO_NS_Method_Request_Updates_No_Copy
+ * @class TAO_Notify_Method_Request_Updates_No_Copy
  *
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Updates_No_Copy : public TAO_NS_Method_Request_Updates_No_Copy_Base
-                                                                ,public TAO_NS_Method_Request_No_Copy
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base
+                                                                ,public TAO_Notify_Method_Request_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Updates_No_Copy (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy);
+  TAO_Notify_Method_Request_Updates_No_Copy (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed, TAO_Notify_Proxy* proxy);
 
   /// Destructor
-  ~TAO_NS_Method_Request_Updates_No_Copy ();
+  ~TAO_Notify_Method_Request_Updates_No_Copy ();
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -86,4 +86,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_UPDATES_H */
+#endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
index e191e7edb85..2184bfe52c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Method_Request_Updates_T_CPP
-#define TAO_NS_Method_Request_Updates_T_CPP
+#ifndef TAO_Notify_Method_Request_Updates_T_CPP
+#define TAO_Notify_Method_Request_Updates_T_CPP
 
 #include "Method_Request_Updates_T.h"
 
@@ -8,18 +8,18 @@
 #include "Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Method_Request_Updates_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates_T, "$id$")
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed,
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed,
                                                                                                       PROXY_PARAM proxy)
   : added_ (added), removed_ (removed), proxy_ (proxy)
 {
 }
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
-TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Updates_T ()
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_Notify_Method_Request_Updates_T ()
 {
 }
 
-#endif /* TAO_NS_Method_Request_Updates_T_CPP */
+#endif /* TAO_Notify_Method_Request_Updates_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index ae64d1eb0a4..0195e16b19a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_METHOD_REQUEST_UPDATES_T_H
-#define TAO_NS_METHOD_REQUEST_UPDATES_T_H
+#ifndef TAO_Notify_METHOD_REQUEST_UPDATES_T_H
+#define TAO_Notify_METHOD_REQUEST_UPDATES_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,20 +22,20 @@
 #include "tao/corba.h"
 
 /**
- * @class TAO_NS_Method_Request_Updates_T
+ * @class TAO_Notify_Method_Request_Updates_T
  *
  * @brief
  *
  */
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
-class TAO_Notify_Export TAO_NS_Method_Request_Updates_T
+class TAO_Notify_Export TAO_Notify_Method_Request_Updates_T
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, PROXY_PARAM proxy);
+  TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, PROXY_PARAM proxy);
 
   /// Destructor
-  virtual ~TAO_NS_Method_Request_Updates_T ();
+  virtual ~TAO_Notify_Method_Request_Updates_T ();
 
   /// Execute the Request
   int execute_i (ACE_ENV_SINGLE_ARG_DECL);
@@ -64,4 +64,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_METHOD_REQUEST_UPDATES_T_H */
+#endif /* TAO_Notify_METHOD_REQUEST_UPDATES_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index a78679f4b9a..fd04b31e518 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -3,14 +3,14 @@
 #include "Peer.h"
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->proxy_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
 
   ACE_TRY
     {
-      TAO_NS_Peer* peer = this->proxy_->peer();
+      TAO_Notify_Peer* peer = this->proxy_->peer();
 
       if (peer != 0)
         {
@@ -21,7 +21,7 @@ TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (
   ACE_CATCHANY
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Updates::execute error sending updates\n ");
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
     }
   ACE_ENDTRY;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 0dc683e4f0b..277c20ec444 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -5,16 +5,16 @@
 
 ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$")
 
-TAO_NS_Constraint_Interpreter::TAO_NS_Constraint_Interpreter (void)
+TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void)
 {
 }
 
-TAO_NS_Constraint_Interpreter::~TAO_NS_Constraint_Interpreter (void)
+TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
 {
 }
 
 void
-TAO_NS_Constraint_Interpreter::build_tree (
+TAO_Notify_Constraint_Interpreter::build_tree (
     const char *constraints
     ACE_ENV_ARG_DECL
   )
@@ -38,7 +38,7 @@ TAO_NS_Constraint_Interpreter::build_tree (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Interpreter::evaluate (TAO_NS_Constraint_Visitor &evaluator)
+TAO_Notify_Constraint_Interpreter::evaluate (TAO_Notify_Constraint_Visitor &evaluator)
 {
   CORBA::Boolean retval = evaluator.evaluate_constraint (this->root_);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index e603de0139c..3a94d0918fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -25,21 +25,21 @@
 #include "orbsvcs/CosNotifyFilterC.h"
 #include "notify_export.h"
 
-class TAO_NS_Constraint_Visitor;
+class TAO_Notify_Constraint_Visitor;
 
 /**
- * @class TAO_NS_Constraint_Interpreter
+ * @class TAO_Notify_Constraint_Interpreter
  *
  * @brief "ETCL" Interpreter for the Notify queries.
  */
-class TAO_Notify_Export TAO_NS_Constraint_Interpreter : public TAO_ETCL_Interpreter
+class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter
 {
 public:
   // = Initialization and termination methods.
-  TAO_NS_Constraint_Interpreter (void);
+  TAO_Notify_Constraint_Interpreter (void);
 
   /// Destructor
-  ~TAO_NS_Constraint_Interpreter (void);
+  ~TAO_Notify_Constraint_Interpreter (void);
 
   /**
    * This method builds an expression tree representing the
@@ -54,7 +54,7 @@ public:
 
   /// Returns true if the constraint is evaluated successfully by
   /// the evaluator.
-  CORBA::Boolean evaluate (TAO_NS_Constraint_Visitor &evaluator);
+  CORBA::Boolean evaluate (TAO_Notify_Constraint_Visitor &evaluator);
 };
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index bcc037cbbf1..fb6a3262cb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -10,7 +10,7 @@
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
 
-TAO_NS_Constraint_Visitor::TAO_NS_Constraint_Visitor (void)
+TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
   : implicit_id_ (NONE)
 {
   (void) this->implicit_ids_.bind (ACE_CString ("filterable_data",
@@ -52,7 +52,7 @@ TAO_NS_Constraint_Visitor::TAO_NS_Constraint_Visitor (void)
 }
 
 int
-TAO_NS_Constraint_Visitor::bind_structured_event (
+TAO_Notify_Constraint_Visitor::bind_structured_event (
     const CosNotification::StructuredEvent &s_event
   )
 {
@@ -113,7 +113,7 @@ TAO_NS_Constraint_Visitor::bind_structured_event (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::evaluate_constraint (
+TAO_Notify_Constraint_Visitor::evaluate_constraint (
     TAO_ETCL_Constraint* root
   )
 {
@@ -137,7 +137,7 @@ TAO_NS_Constraint_Visitor::evaluate_constraint (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_literal (
+TAO_Notify_Constraint_Visitor::visit_literal (
     TAO_ETCL_Literal_Constraint *literal
   )
 {
@@ -146,7 +146,7 @@ TAO_NS_Constraint_Visitor::visit_literal (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
+TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
 {
   int return_value = -1;
   const char *name = ident->value ();
@@ -167,7 +167,7 @@ TAO_NS_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_union_value (
+TAO_Notify_Constraint_Visitor::visit_union_value (
     TAO_ETCL_Union_Value *union_value
   )
 {
@@ -190,7 +190,7 @@ TAO_NS_Constraint_Visitor::visit_union_value (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_union_pos (
+TAO_Notify_Constraint_Visitor::visit_union_pos (
     TAO_ETCL_Union_Pos *union_pos
   )
 {
@@ -355,7 +355,7 @@ TAO_NS_Constraint_Visitor::visit_union_pos (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_component_pos (
+TAO_Notify_Constraint_Visitor::visit_component_pos (
     TAO_ETCL_Component_Pos *pos
   )
 {
@@ -452,7 +452,7 @@ TAO_NS_Constraint_Visitor::visit_component_pos (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_component_assoc (
+TAO_Notify_Constraint_Visitor::visit_component_assoc (
     TAO_ETCL_Component_Assoc *assoc
   )
 {
@@ -514,7 +514,7 @@ TAO_NS_Constraint_Visitor::visit_component_assoc (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_component_array (
+TAO_Notify_Constraint_Visitor::visit_component_array (
     TAO_ETCL_Component_Array *array
   )
 {
@@ -610,7 +610,7 @@ TAO_NS_Constraint_Visitor::visit_component_array (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
+TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -684,7 +684,7 @@ TAO_NS_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_component (
+TAO_Notify_Constraint_Visitor::visit_component (
     TAO_ETCL_Component *component
   )
 {
@@ -782,7 +782,7 @@ TAO_NS_Constraint_Visitor::visit_component (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot)
+TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot)
 {
   // If we are here, we know we're headed for a more nested
   // level, so we just visit it, there's nothing else in this
@@ -791,14 +791,14 @@ TAO_NS_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot)
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_eval (TAO_ETCL_Eval *eval)
+TAO_Notify_Constraint_Visitor::visit_eval (TAO_ETCL_Eval *eval)
 {
   // Nothing to do but visit the contained component.
   return eval->component ()->accept (this);
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
+TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
 {
   TAO_ETCL_Constraint *comp = def->component ();
 
@@ -847,7 +847,7 @@ TAO_NS_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
+TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
 {
   TAO_ETCL_Constraint *component = exist->component ();
 
@@ -902,7 +902,7 @@ TAO_NS_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_unary_expr (
+TAO_Notify_Constraint_Visitor::visit_unary_expr (
     TAO_ETCL_Unary_Expr *unary_expr
   )
 {
@@ -943,7 +943,7 @@ TAO_NS_Constraint_Visitor::visit_unary_expr (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_binary_expr (
+TAO_Notify_Constraint_Visitor::visit_binary_expr (
     TAO_ETCL_Binary_Expr *binary_expr
   )
 {
@@ -977,7 +977,7 @@ TAO_NS_Constraint_Visitor::visit_binary_expr (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_or (
+TAO_Notify_Constraint_Visitor::visit_or (
     TAO_ETCL_Binary_Expr *binary
   )
 {
@@ -1019,7 +1019,7 @@ TAO_NS_Constraint_Visitor::visit_or (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_and (
+TAO_Notify_Constraint_Visitor::visit_and (
     TAO_ETCL_Binary_Expr *binary
   )
 {
@@ -1061,7 +1061,7 @@ TAO_NS_Constraint_Visitor::visit_and (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_binary_op (
+TAO_Notify_Constraint_Visitor::visit_binary_op (
     TAO_ETCL_Binary_Expr *binary,
     int op_type
   )
@@ -1132,7 +1132,7 @@ TAO_NS_Constraint_Visitor::visit_binary_op (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_twiddle (
+TAO_Notify_Constraint_Visitor::visit_twiddle (
     TAO_ETCL_Binary_Expr *binary
   )
 {
@@ -1162,7 +1162,7 @@ TAO_NS_Constraint_Visitor::visit_twiddle (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_in (
+TAO_Notify_Constraint_Visitor::visit_in (
     TAO_ETCL_Binary_Expr *binary
   )
 {
@@ -1240,7 +1240,7 @@ TAO_NS_Constraint_Visitor::visit_in (
 }
 
 int
-TAO_NS_Constraint_Visitor::visit_preference (
+TAO_Notify_Constraint_Visitor::visit_preference (
     TAO_ETCL_Preference *
   )
 {
@@ -1252,7 +1252,7 @@ TAO_NS_Constraint_Visitor::visit_preference (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::sequence_does_contain (
+TAO_Notify_Constraint_Visitor::sequence_does_contain (
     const CORBA::Any *any,
     TAO_ETCL_Literal_Constraint &item
   )
@@ -1306,7 +1306,7 @@ TAO_NS_Constraint_Visitor::sequence_does_contain (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::array_does_contain (
+TAO_Notify_Constraint_Visitor::array_does_contain (
     const CORBA::Any *any,
     TAO_ETCL_Literal_Constraint &item
   )
@@ -1360,7 +1360,7 @@ TAO_NS_Constraint_Visitor::array_does_contain (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::struct_does_contain (
+TAO_Notify_Constraint_Visitor::struct_does_contain (
     const CORBA::Any *any,
     TAO_ETCL_Literal_Constraint &item
   )
@@ -1416,7 +1416,7 @@ TAO_NS_Constraint_Visitor::struct_does_contain (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::union_does_contain (
+TAO_Notify_Constraint_Visitor::union_does_contain (
     const CORBA::Any *any,
     TAO_ETCL_Literal_Constraint &item
   )
@@ -1465,7 +1465,7 @@ TAO_NS_Constraint_Visitor::union_does_contain (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::any_does_contain (
+TAO_Notify_Constraint_Visitor::any_does_contain (
     const CORBA::Any *any,
     TAO_ETCL_Literal_Constraint &item
   )
@@ -1481,7 +1481,7 @@ TAO_NS_Constraint_Visitor::any_does_contain (
 }
 
 CORBA::Boolean
-TAO_NS_Constraint_Visitor::simple_type_match (int expr_type,
+TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type,
                                                   CORBA::TCKind tc_kind)
 {
   switch (expr_type)
@@ -1537,14 +1537,14 @@ template class ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint>;
 template class ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint>;
 
 
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Entry <ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry <ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field>;
+template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>
@@ -1559,13 +1559,13 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_NS_Constraint_V
 #pragma instantiate ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint>
 
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_NS_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 5a70d17a6f8..0aecddbf37d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -30,12 +30,12 @@ class TAO_ETCL_Constraint;
 class TAO_ETCL_Literal_Constraint;
 class TAO_Notify_Property_Constraint;
 
-class TAO_Notify_Export TAO_NS_Constraint_Visitor
+class TAO_Notify_Export TAO_Notify_Constraint_Visitor
   : public TAO_ETCL_Constraint_Visitor
 {
 public:
   /// Constructor.
-  TAO_NS_Constraint_Visitor (void);
+  TAO_Notify_Constraint_Visitor (void);
 
   /// Put the event data into our hash map.
   int bind_structured_event (const CosNotification::StructuredEvent &s_event);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 21bd6f97f15..91a23f48ff6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -12,7 +12,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
-  TAO_Notify_Service* notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NS_COS_NOTIFICATION_SERVICE_NAME);
+  TAO_Notify_Service* notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_COS_NOTIFICATION_SERVICE_NAME);
 
   if (notify_service == 0)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index d228fe793e7..49c9b9b07a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -13,9 +13,9 @@
 #include "Object.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Object, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Object, "$Id$")
 
-TAO_NS_Object::TAO_NS_Object (void)
+TAO_Notify_Object::TAO_Notify_Object (void)
   : event_manager_ (0)
   , admin_properties_ (0)
   , id_ (0)
@@ -32,7 +32,7 @@ TAO_NS_Object::TAO_NS_Object (void)
     ACE_DEBUG ((LM_DEBUG,"object:%x  created\n", this ));
 }
 
-TAO_NS_Object::~TAO_NS_Object ()
+TAO_Notify_Object::~TAO_Notify_Object ()
 {
   if (TAO_debug_level > 2 )
     ACE_DEBUG ((LM_DEBUG,"object:%x  destroyed\n", this ));
@@ -42,7 +42,7 @@ TAO_NS_Object::~TAO_NS_Object ()
 }
 
 void
-TAO_NS_Object::init (TAO_NS_Object* parent)
+TAO_Notify_Object::init (TAO_Notify_Object* parent)
 {
   this->event_manager_ = parent->event_manager_;
   this->admin_properties_ = parent->admin_properties_;
@@ -61,13 +61,13 @@ TAO_NS_Object::init (TAO_NS_Object* parent)
 }
 
 CORBA::Object_ptr
-TAO_NS_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   return this->poa_->activate (servant, this->id_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -87,7 +87,7 @@ TAO_NS_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
@@ -106,13 +106,13 @@ TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_NS_Object::ref (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->poa_->id_to_reference (this->id_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Object::shutdown_worker_task (void)
+TAO_Notify_Object::shutdown_worker_task (void)
 {
   // Only do this if we are the owner.
   if (this->own_worker_task_ == 1)
@@ -125,7 +125,7 @@ TAO_NS_Object::shutdown_worker_task (void)
 }
 
 void
-TAO_NS_Object::shutdown_proxy_poa (void)
+TAO_Notify_Object::shutdown_proxy_poa (void)
 {
   if (this->own_proxy_poa_ == 1)
     {
@@ -147,7 +147,7 @@ TAO_NS_Object::shutdown_proxy_poa (void)
 }
 
 void
-TAO_NS_Object::shutdown_object_poa (void)
+TAO_Notify_Object::shutdown_object_poa (void)
 {
   if (this->own_object_poa_ == 1)
     {
@@ -169,7 +169,7 @@ TAO_NS_Object::shutdown_object_poa (void)
 }
 
 void
-TAO_NS_Object::worker_task_own (TAO_NS_Worker_Task* worker_task)
+TAO_Notify_Object::worker_task_own (TAO_Notify_Worker_Task* worker_task)
 {
   this->worker_task (worker_task);
 
@@ -178,7 +178,7 @@ TAO_NS_Object::worker_task_own (TAO_NS_Worker_Task* worker_task)
 }
 
 void
-TAO_NS_Object::worker_task (TAO_NS_Worker_Task* worker_task)
+TAO_Notify_Object::worker_task (TAO_Notify_Worker_Task* worker_task)
 {
   // shutdown the current worker.
   this->shutdown_worker_task ();
@@ -192,7 +192,7 @@ TAO_NS_Object::worker_task (TAO_NS_Worker_Task* worker_task)
 }
 
 void
-TAO_NS_Object::proxy_poa_own (TAO_NS_POA_Helper* proxy_poa)
+TAO_Notify_Object::proxy_poa_own (TAO_Notify_POA_Helper* proxy_poa)
 {
   // shutdown current proxy poa.
   this->shutdown_proxy_poa ();
@@ -204,7 +204,7 @@ TAO_NS_Object::proxy_poa_own (TAO_NS_POA_Helper* proxy_poa)
 }
 
 void
-TAO_NS_Object::object_poa_own (TAO_NS_POA_Helper* object_poa)
+TAO_Notify_Object::object_poa_own (TAO_Notify_POA_Helper* object_poa)
 {
   // shutdown current object poa.
   this->shutdown_object_poa ();
@@ -217,11 +217,11 @@ TAO_NS_Object::object_poa_own (TAO_NS_POA_Helper* object_poa)
 }
 
 void
-TAO_NS_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
 {
   CosNotification::PropertyErrorSeq err_seq;
 
-  TAO_NS_QoSProperties new_qos_properties;
+  TAO_Notify_QoSProperties new_qos_properties;
 
   if (new_qos_properties.init (qos, err_seq) == -1)
     ACE_THROW (CORBA::INTERNAL ());
@@ -230,13 +230,13 @@ TAO_NS_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_D
   if (new_qos_properties.thread_pool ().is_valid ())
     {
       if (new_qos_properties.thread_pool ().value ().static_threads == 0)
-        TAO_NS_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
+        TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
       else
-        TAO_NS_PROPERTIES::instance()->builder()->
+        TAO_Notify_PROPERTIES::instance()->builder()->
           apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
     }
   else if (new_qos_properties.thread_pool_lane ().is_valid ())
-    TAO_NS_PROPERTIES::instance()->builder()->
+    TAO_Notify_PROPERTIES::instance()->builder()->
       apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -255,7 +255,7 @@ TAO_NS_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_D
 }
 
 CosNotification::QoSProperties*
-TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotification::QoSProperties_var properties;
 
@@ -269,13 +269,13 @@ TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Object::qos_changed (const TAO_NS_QoSProperties& /*qos_properties*/)
+TAO_Notify_Object::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/)
 {
   // NOP.
 }
 
-TAO_NS_Timer*
-TAO_NS_Object::timer (void)
+TAO_Notify_Timer*
+TAO_Notify_Object::timer (void)
 {
   return this->worker_task_->timer ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 7c8dc3bf41f..de05e1cd871 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_OBJECT_H
-#define TAO_NS_OBJECT_H
+#ifndef TAO_Notify_OBJECT_H
+#define TAO_Notify_OBJECT_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,30 +25,30 @@
 #include "AdminProperties.h"
 #include "Refcountable.h"
 
-class TAO_NS_POA_Helper;
-class TAO_NS_Worker_Task;
-class TAO_NS_Event_Manager;
-class TAO_NS_Timer;
+class TAO_Notify_POA_Helper;
+class TAO_Notify_Worker_Task;
+class TAO_Notify_Event_Manager;
+class TAO_Notify_Timer;
 
 /**
- * @class TAO_NS_Object
+ * @class TAO_Notify_Object
  *
  * @brief Base Object for RT_Notify's CORBA Objects.
  *
  */
-class TAO_Notify_Export TAO_NS_Object : public TAO_NS_Refcountable
+class TAO_Notify_Export TAO_Notify_Object : public TAO_Notify_Refcountable
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Id for Objects.
   typedef CORBA::Long ID;
 
   /// Constuctor
-  TAO_NS_Object (void);
+  TAO_Notify_Object (void);
 
   /// Destructor
-  virtual ~TAO_NS_Object (void);
+  virtual ~TAO_Notify_Object (void);
 
   /// This Object's ID
   ID id (void);
@@ -66,28 +66,28 @@ public:
   CORBA::Object_ptr ref (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get Worker Task.
-  TAO_NS_Worker_Task* worker_task (void);
+  TAO_Notify_Worker_Task* worker_task (void);
 
   /// Get the POA assigned to us.
-  TAO_NS_POA_Helper* poa (void);
+  TAO_Notify_POA_Helper* poa (void);
 
   /// Setting the proxy_poa_ gives ownership to this class.
-  void proxy_poa_own (TAO_NS_POA_Helper* proxy_poa);
+  void proxy_poa_own (TAO_Notify_POA_Helper* proxy_poa);
 
   /// Accessor for the proxy_poa_
-  TAO_NS_POA_Helper* proxy_poa (void);
+  TAO_Notify_POA_Helper* proxy_poa (void);
 
   /// Setting the object_poa_ gives ownership to this class.
-  void object_poa_own (TAO_NS_POA_Helper* object_poa);
+  void object_poa_own (TAO_Notify_POA_Helper* object_poa);
 
   /// Accessor for the object_poa_
-  TAO_NS_POA_Helper* object_poa (void);
+  TAO_Notify_POA_Helper* object_poa (void);
 
   /// Set Worker Task. This object assume ownership of the set object.
-  void worker_task_own (TAO_NS_Worker_Task* worker_task);
+  void worker_task_own (TAO_Notify_Worker_Task* worker_task);
 
   /// Set Worker Task. Does not assume ownership.
-  void worker_task (TAO_NS_Worker_Task* worker_task);
+  void worker_task (TAO_Notify_Worker_Task* worker_task);
 
   /// Set the QoS Properties.
   virtual void set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL);
@@ -96,17 +96,17 @@ public:
   CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain the Timer manager associated with this object.
-  virtual TAO_NS_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer (void);
 
   /// shutdown. Returns 1 ifif the shutdown was already run once before.
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Accessor for the Event Manager
-  TAO_NS_Event_Manager* event_manager (void);
+  TAO_Notify_Event_Manager* event_manager (void);
 
 protected:
   /// Init this object with data from <rhs>.
-  void init (TAO_NS_Object* parent);
+  void init (TAO_Notify_Object* parent);
 
   /// Shutdown the current worker task and delete it if we own it.
   void shutdown_worker_task (void);
@@ -118,39 +118,39 @@ protected:
   void shutdown_object_poa (void);
 
   /// Notification that can be overridden by subclasses to be informed that <qos_properties_> have been modified.
-  virtual void qos_changed (const TAO_NS_QoSProperties& qos_properties);
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   ///= Protected data members.
 
   /// The event manager.
-  TAO_NS_Event_Manager* event_manager_;
+  TAO_Notify_Event_Manager* event_manager_;
 
   /// Admin Properties.
-  TAO_NS_AdminProperties_var admin_properties_;
+  TAO_Notify_AdminProperties_var admin_properties_;
 
   /// QoS Properties.
-  TAO_NS_QoSProperties qos_properties_;
+  TAO_Notify_QoSProperties qos_properties_;
 
   /// Id assigned to this object
   ID id_;
 
   /// The POA in which the object is activated.
-  TAO_NS_POA_Helper* poa_;
+  TAO_Notify_POA_Helper* poa_;
 
   /// The POA in which the proxys are activated.
-  TAO_NS_POA_Helper* proxy_poa_;
+  TAO_Notify_POA_Helper* proxy_poa_;
 
   /// Flag that indicates if we own <proxy_poa_>
   int own_proxy_poa_;
 
   /// The POA in which the object's children are activated.
-  TAO_NS_POA_Helper* object_poa_;
+  TAO_Notify_POA_Helper* object_poa_;
 
   /// Flag that indicates if we own <object_poa_>
   int own_object_poa_;
 
   /// Worker Task.
-  TAO_NS_Worker_Task* worker_task_;
+  TAO_Notify_Worker_Task* worker_task_;
 
   /// Ownership flag
   int own_worker_task_;
@@ -164,4 +164,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_OBJECT_H */
+#endif /* TAO_Notify_OBJECT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 5cf10b3b1c9..9ba8797906a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -1,43 +1,43 @@
 // $Id$
 
 ACE_INLINE CORBA::Long
-TAO_NS_Object::id (void)
+TAO_Notify_Object::id (void)
 {
   return id_;
 }
 
-ACE_INLINE TAO_NS_Worker_Task*
-TAO_NS_Object::worker_task (void)
+ACE_INLINE TAO_Notify_Worker_Task*
+TAO_Notify_Object::worker_task (void)
 {
   return this->worker_task_;
 }
 
-ACE_INLINE TAO_NS_POA_Helper*
-TAO_NS_Object::poa (void)
+ACE_INLINE TAO_Notify_POA_Helper*
+TAO_Notify_Object::poa (void)
 {
   return this->poa_;
 }
 
-ACE_INLINE TAO_NS_POA_Helper*
-TAO_NS_Object::object_poa (void)
+ACE_INLINE TAO_Notify_POA_Helper*
+TAO_Notify_Object::object_poa (void)
 {
   return this->object_poa_;
 }
 
-ACE_INLINE TAO_NS_POA_Helper*
-TAO_NS_Object::proxy_poa (void)
+ACE_INLINE TAO_Notify_POA_Helper*
+TAO_Notify_Object::proxy_poa (void)
 {
   return this->proxy_poa_;
 }
 
 ACE_INLINE int
-TAO_NS_Object::has_shutdown (void)
+TAO_Notify_Object::has_shutdown (void)
 {
   return this->shutdown_;
 }
 
-ACE_INLINE TAO_NS_Event_Manager*
-TAO_NS_Object::event_manager (void)
+ACE_INLINE TAO_Notify_Event_Manager*
+TAO_Notify_Object::event_manager (void)
 {
   return this->event_manager_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 379d8cdcf57..7299bb672ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -6,24 +6,24 @@
 #include "POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_POA_Helper, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
 
 #include "tao/debug.h"
 
-TAO_NS_POA_Helper::TAO_NS_POA_Helper (void)
+TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void)
 {
 }
 
-TAO_NS_POA_Helper::~TAO_NS_POA_Helper ()
+TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper ()
 {
 
 }
 
 ACE_CString
-TAO_NS_POA_Helper::get_unique_id (void)
+TAO_Notify_POA_Helper::get_unique_id (void)
 {
   /// Factory for generating unique ids for the POAs.
-  static TAO_NS_ID_Factory poa_id_factory;
+  static TAO_Notify_ID_Factory poa_id_factory;
 
   char buf[32];
   ACE_OS_String::itoa (poa_id_factory.id (), buf, 10);
@@ -32,7 +32,7 @@ TAO_NS_POA_Helper::get_unique_id (void)
 }
 
 void
-TAO_NS_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList policy_list (2);
 
@@ -43,7 +43,7 @@ TAO_NS_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_nam
 }
 
 void
-TAO_NS_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
@@ -51,7 +51,7 @@ TAO_NS_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
 {
   policy_list.length (2);
 
@@ -68,7 +68,7 @@ TAO_NS_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::Policy
 
 
 void
-TAO_NS_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
 {
   PortableServer::POAManager_var manager =
     parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -93,7 +93,7 @@ TAO_NS_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa
 }
 
 PortableServer::ObjectId *
-TAO_NS_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
 {
   // Modified code from string_to_ObjectId ..
   //
@@ -123,7 +123,7 @@ TAO_NS_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
 }
 
 CORBA::Object_ptr
-TAO_NS_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL)
 {
   // Generate a new ID.
   id = this->id_factory_.id ();
@@ -146,7 +146,7 @@ TAO_NS_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id AC
 }
 
 void
-TAO_NS_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
@@ -157,7 +157,7 @@ TAO_NS_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
 }
 
 CORBA::Object_ptr
-TAO_NS_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
@@ -169,7 +169,7 @@ TAO_NS_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
 }
 
 void
-TAO_NS_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER);
  // The <wait_for_completion> flag = 0
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 04d6ffbd8c8..f9c76d22c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_POA_Helper_H
-#define TAO_NS_POA_Helper_H
+#ifndef TAO_Notify_POA_Helper_H
+#define TAO_Notify_POA_Helper_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,16 +24,16 @@
 #include "ID_Factory.h"
 
 /**
- * @class TAO_NS_POA_Helper
+ * @class TAO_Notify_POA_Helper
  *
  * @brief POA Abstraction.
  *
  */
-class TAO_Notify_Export TAO_NS_POA_Helper : private ACE_Copy_Disabled
+class TAO_Notify_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled
 {
 public:
   /// Default Constructor
-  TAO_NS_POA_Helper (void);
+  TAO_Notify_POA_Helper (void);
 
   /// Create a new PortableServer::POA.
   void init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL);
@@ -42,7 +42,7 @@ public:
   void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
 
   /// Destructor
-  virtual ~TAO_NS_POA_Helper ();
+  virtual ~TAO_Notify_POA_Helper ();
 
   /// Get underlying POA
   PortableServer::POA_ptr poa (void);
@@ -73,7 +73,7 @@ protected:
   PortableServer::POA_var poa_;
 
   /// ID Factory for objects.
-  TAO_NS_ID_Factory id_factory_;
+  TAO_Notify_ID_Factory id_factory_;
 
   /// Convert id to ObjectID
   PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const;
@@ -84,4 +84,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_POA_Helper_H */
+#endif /* TAO_Notify_POA_Helper_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
index 3fc996c803c..e11089afb4d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_NS_POA_Helper::poa (void)
+TAO_Notify_POA_Helper::poa (void)
 {
   return this->poa_.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 652645184ee..d130d84b60a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -6,42 +6,42 @@
 #include "Peer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Peer, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$")
 
 #include "tao/debug.h"
 #include "Proxy.h"
 
-TAO_NS_Peer::TAO_NS_Peer (void)
+TAO_Notify_Peer::TAO_Notify_Peer (void)
 {
 }
 
-TAO_NS_Peer::~TAO_NS_Peer ()
+TAO_Notify_Peer::~TAO_Notify_Peer ()
 {
 }
 
 void
-TAO_NS_Peer::qos_changed (const TAO_NS_QoSProperties& /*qos_properties*/)
+TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/)
 {
   // NOP.
 }
 
 void
-TAO_NS_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // NOP.
 }
 
 void
-TAO_NS_Peer::handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Peer::handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented.
   this->proxy ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Peer::dispatch_updates (const TAO_NS_EventTypeSeq & added, const TAO_NS_EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const TAO_Notify_EventTypeSeq & removed ACE_ENV_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq subscribed_types ;
+  TAO_Notify_EventTypeSeq subscribed_types ;
   this->proxy ()->subscribed_types (subscribed_types ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -50,7 +50,7 @@ TAO_NS_Peer::dispatch_updates (const TAO_NS_EventTypeSeq & added, const TAO_NS_E
       CosNotification::EventTypeSeq cos_added;
       CosNotification::EventTypeSeq cos_removed;
 
-      const TAO_NS_EventType& special = TAO_NS_EventType::special ();
+      const TAO_Notify_EventType& special = TAO_Notify_EventType::special ();
 
       // Don;t inform of types that we already know about.
       // E.g. if we're subscribed for {A,B,C,F}
@@ -64,8 +64,8 @@ TAO_NS_Peer::dispatch_updates (const TAO_NS_EventTypeSeq & added, const TAO_NS_E
       // then, we should only send {A,B} because the peer is not interested in D.
       // However if we're subscribed for everything, send all kinds of removes.
 
-      TAO_NS_EventTypeSeq added_result = added;
-      TAO_NS_EventTypeSeq removed_result;
+      TAO_Notify_EventTypeSeq added_result = added;
+      TAO_Notify_EventTypeSeq removed_result;
 
       if (subscribed_types.find (special) != 0)
         {
@@ -82,7 +82,7 @@ TAO_NS_Peer::dispatch_updates (const TAO_NS_EventTypeSeq & added, const TAO_NS_E
 
       if (cos_added.length () != 0 || cos_removed.length () != 0)
         {
-          TAO_NS_Proxy_Guard proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
+          TAO_Notify_Proxy_Guard proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
 
           this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 13dd08e5ab2..7f68e0590b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PEER_H
-#define TAO_NS_PEER_H
+#ifndef TAO_Notify_PEER_H
+#define TAO_Notify_PEER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,25 +22,25 @@
 #include "orbsvcs/CosNotificationC.h"
 #include "EventTypeSeq.h"
 
-class TAO_NS_Proxy;
-class TAO_NS_QoSProperties;
-class TAO_NS_Peer;
+class TAO_Notify_Proxy;
+class TAO_Notify_QoSProperties;
+class TAO_Notify_Peer;
 
 /**
- * @class TAO_NS_Peer
+ * @class TAO_Notify_Peer
  *
  * @brief Base class for Supplier and Consumer classes.
  *        This object delegates its reference count to its creator proxy object.
  *
  */
-class TAO_Notify_Export TAO_NS_Peer
+class TAO_Notify_Export TAO_Notify_Peer
 {
 public:
   /// Constuctor
-  TAO_NS_Peer (void);
+  TAO_Notify_Peer (void);
 
   /// Destructor
-  virtual ~TAO_NS_Peer ();
+  virtual ~TAO_Notify_Peer ();
 
   /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy
   CORBA::ULong _incr_refcnt (void);
@@ -53,15 +53,15 @@ public:
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Access Proxy.
-  virtual TAO_NS_Proxy* proxy (void) = 0;
+  virtual TAO_Notify_Proxy* proxy (void) = 0;
 
   // Dispatch updates
-  virtual void dispatch_updates (const TAO_NS_EventTypeSeq & added,
-                                 const TAO_NS_EventTypeSeq & removed
+  virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added,
+                                 const TAO_Notify_EventTypeSeq & removed
                                  ACE_ENV_ARG_DECL);
 
   /// QoS changed notification from the Peer.
-  virtual void qos_changed (const TAO_NS_QoSProperties& qos_properties);
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Handle dispatch exceptions.
   void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
@@ -78,4 +78,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PEER_H */
+#endif /* TAO_Notify_PEER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.inl b/TAO/orbsvcs/orbsvcs/Notify/Peer.inl
index 9fc05856b37..8ac8026061a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.inl
@@ -3,13 +3,13 @@
 #include "Proxy.h"
 
 ACE_INLINE CORBA::ULong
-TAO_NS_Peer::_incr_refcnt (void)
+TAO_Notify_Peer::_incr_refcnt (void)
 {
   return this->proxy ()->_incr_refcnt ();
 }
 
 ACE_INLINE CORBA::ULong
-TAO_NS_Peer::_decr_refcnt (void)
+TAO_Notify_Peer::_decr_refcnt (void)
 {
   return this->proxy ()->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 4e7bd74b63b..316807f8174 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -8,9 +8,9 @@
 #include "Properties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, TAO_NS_Properties, "$Id$")
+ACE_RCSID (Notify, TAO_Notify_Properties, "$Id$")
 
-TAO_NS_Properties::TAO_NS_Properties (void)
+TAO_Notify_Properties::TAO_Notify_Properties (void)
   : factory_ (0)
   , builder_ (0)
   , asynch_updates_ (0)
@@ -27,16 +27,16 @@ TAO_NS_Properties::TAO_NS_Properties (void)
     ACE_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this));
 }
 
-TAO_NS_Properties::~TAO_NS_Properties ()
+TAO_Notify_Properties::~TAO_Notify_Properties ()
 {
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX>;
+template class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX>
+#pragma instantiate TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 5eb3d1a6e2e..6240a0a18ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROPERTIES_H
-#define TAO_NS_PROPERTIES_H
+#ifndef TAO_Notify_PROPERTIES_H
+#define TAO_Notify_PROPERTIES_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,32 +24,32 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/CosNotificationC.h"
 
-class TAO_NS_Factory;
-class TAO_NS_Builder;
+class TAO_Notify_Factory;
+class TAO_Notify_Builder;
 
 /**
- * @class TAO_NS_Properties
+ * @class TAO_Notify_Properties
  *
  * @brief Global properties that strategize Notify's run-time behaviour.
  *
  */
-class TAO_Notify_Export TAO_NS_Properties
+class TAO_Notify_Export TAO_Notify_Properties
 {
-  friend class TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX>;
+  friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>;
 
 public:
   /// Constuctor
-  TAO_NS_Properties (void);
+  TAO_Notify_Properties (void);
 
   /// Destructor
-  ~TAO_NS_Properties ();
+  ~TAO_Notify_Properties ();
 
   // = Property Accessors
-  TAO_NS_Factory* factory (void);
-  void factory (TAO_NS_Factory* factory);
+  TAO_Notify_Factory* factory (void);
+  void factory (TAO_Notify_Factory* factory);
 
-  TAO_NS_Builder* builder (void);
-  void builder (TAO_NS_Builder* builder);
+  TAO_Notify_Builder* builder (void);
+  void builder (TAO_Notify_Builder* builder);
 
   CORBA::ORB_ptr orb (void);
   void orb (CORBA::ORB_ptr orb);
@@ -92,10 +92,10 @@ public:
 
 protected:
   /// Object Factory
-  TAO_NS_Factory* factory_;
+  TAO_Notify_Factory* factory_;
 
   /// Object Builder
-  TAO_NS_Builder* builder_;
+  TAO_Notify_Builder* builder_;
 
   /// ORB
   CORBA::ORB_var orb_;
@@ -125,13 +125,13 @@ protected:
   CosNotification::QoSProperties pc_qos_;
 };
 
-typedef TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX> TAO_NS_PROPERTIES;
+typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES;
 
-TAO_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_NS_Properties, TAO_SYNCH_MUTEX);
+TAO_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX);
 
 #if defined (__ACE_INLINE__)
 #include "Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROPERTIES_H */
+#endif /* TAO_Notify_PROPERTIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index 5265fdc82c5..c281a692d23 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -1,121 +1,121 @@
 // $Id$
 
-ACE_INLINE TAO_NS_Factory*
-TAO_NS_Properties::factory (void)
+ACE_INLINE TAO_Notify_Factory*
+TAO_Notify_Properties::factory (void)
 {
   return this->factory_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::factory (TAO_NS_Factory* factory)
+TAO_Notify_Properties::factory (TAO_Notify_Factory* factory)
 {
   this->factory_ = factory;
 }
 
-ACE_INLINE TAO_NS_Builder*
-TAO_NS_Properties::builder (void)
+ACE_INLINE TAO_Notify_Builder*
+TAO_Notify_Properties::builder (void)
 {
   return this->builder_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::builder (TAO_NS_Builder* builder)
+TAO_Notify_Properties::builder (TAO_Notify_Builder* builder)
 {
   this->builder_ = builder;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-TAO_NS_Properties::orb (void)
+TAO_Notify_Properties::orb (void)
 {
   return CORBA::ORB::_duplicate (orb_.in ());
 }
 
 ACE_INLINE void
-TAO_NS_Properties::orb (CORBA::ORB_ptr orb)
+TAO_Notify_Properties::orb (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_NS_Properties::default_poa (void)
+TAO_Notify_Properties::default_poa (void)
 {
   return PortableServer::POA::_duplicate (this->default_poa_.in ());
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_poa (PortableServer::POA_ptr default_poa)
+TAO_Notify_Properties::default_poa (PortableServer::POA_ptr default_poa)
 {
   this->default_poa_ = PortableServer::POA::_duplicate (default_poa);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Properties::asynch_updates (void)
+TAO_Notify_Properties::asynch_updates (void)
 {
   return this->asynch_updates_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::asynch_updates (CORBA::Boolean asynch_updates)
+TAO_Notify_Properties::asynch_updates (CORBA::Boolean asynch_updates)
 {
   this->asynch_updates_ = asynch_updates;
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_NS_Properties::default_event_channel_qos_properties (void)
+TAO_Notify_Properties::default_event_channel_qos_properties (void)
 {
   return this->ec_qos_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_event_channel_qos_properties (const CosNotification::QoSProperties &ec_qos)
+TAO_Notify_Properties::default_event_channel_qos_properties (const CosNotification::QoSProperties &ec_qos)
 {
   this->ec_qos_ = ec_qos;
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_NS_Properties::default_supplier_admin_qos_properties (void)
+TAO_Notify_Properties::default_supplier_admin_qos_properties (void)
 {
   return this->sa_qos_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_supplier_admin_qos_properties (const CosNotification::QoSProperties &sa_qos)
+TAO_Notify_Properties::default_supplier_admin_qos_properties (const CosNotification::QoSProperties &sa_qos)
 {
   this->sa_qos_ = sa_qos;
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_NS_Properties::default_consumer_admin_qos_properties (void)
+TAO_Notify_Properties::default_consumer_admin_qos_properties (void)
 {
   return this->ca_qos_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_consumer_admin_qos_properties (const CosNotification::QoSProperties &ca_qos)
+TAO_Notify_Properties::default_consumer_admin_qos_properties (const CosNotification::QoSProperties &ca_qos)
 {
   this->ca_qos_ = ca_qos;
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_NS_Properties::default_proxy_supplier_qos_properties (void)
+TAO_Notify_Properties::default_proxy_supplier_qos_properties (void)
 {
   return this->ps_qos_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_proxy_supplier_qos_properties (const CosNotification::QoSProperties &ps_qos)
+TAO_Notify_Properties::default_proxy_supplier_qos_properties (const CosNotification::QoSProperties &ps_qos)
 {
   this->ps_qos_ = ps_qos;
 }
 
 ACE_INLINE const CosNotification::QoSProperties&
-TAO_NS_Properties::default_proxy_consumer_qos_properties (void)
+TAO_Notify_Properties::default_proxy_consumer_qos_properties (void)
 {
   return this->pc_qos_;
 }
 
 ACE_INLINE void
-TAO_NS_Properties::default_proxy_consumer_qos_properties (const CosNotification::QoSProperties &pc_qos)
+TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotification::QoSProperties &pc_qos)
 {
   this->pc_qos_ = pc_qos;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h
index ae91ce42aff..7b9009f26db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROPERTY_H
-#define TAO_NS_PROPERTY_H
+#ifndef TAO_Notify_PROPERTY_H
+#define TAO_Notify_PROPERTY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,15 +25,15 @@
 #include "orbsvcs/NotifyExtC.h"
 
 template <class LOCK, class TYPE> class ACE_Atomic_Op;
-template <class TYPE> class TAO_NS_Property_T;
-template <class TYPE> class TAO_NS_StructProperty_T;
+template <class TYPE> class TAO_Notify_Property_T;
+template <class TYPE> class TAO_Notify_StructProperty_T;
 
-typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX,CORBA::Long> TAO_NS_Atomic_Property_Long;
-typedef TAO_NS_Property_T<CORBA::Long> TAO_NS_Property_Long;
-typedef TAO_NS_Property_T<CORBA::Short> TAO_NS_Property_Short;
-typedef TAO_NS_Property_T<TimeBase::TimeT> TAO_NS_Property_Time;
-typedef TAO_NS_StructProperty_T<NotifyExt::ThreadPoolParams> TAO_NS_Property_ThreadPool;
-typedef TAO_NS_StructProperty_T<NotifyExt::ThreadPoolLanesParams> TAO_NS_Property_ThreadPoolLanes;
+typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX,CORBA::Long> TAO_Notify_Atomic_Property_Long;
+typedef TAO_Notify_Property_T<CORBA::Long> TAO_Notify_Property_Long;
+typedef TAO_Notify_Property_T<CORBA::Short> TAO_Notify_Property_Short;
+typedef TAO_Notify_Property_T<TimeBase::TimeT> TAO_Notify_Property_Time;
+typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams> TAO_Notify_Property_ThreadPool;
+typedef TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams> TAO_Notify_Property_ThreadPoolLanes;
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROPERTY_H */
+#endif /* TAO_Notify_PROPERTY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 9b30fdefd69..77a4fbc7364 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -6,18 +6,18 @@
 #include "PropertySeq.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_PropertySeq, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$")
 
-TAO_NS_PropertySeq::TAO_NS_PropertySeq (void)
+TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void)
 {
 }
 
-TAO_NS_PropertySeq::~TAO_NS_PropertySeq ()
+TAO_Notify_PropertySeq::~TAO_Notify_PropertySeq ()
 {
 }
 
 int
-TAO_NS_PropertySeq::init (const CosNotification::PropertySeq& prop_seq)
+TAO_Notify_PropertySeq::init (const CosNotification::PropertySeq& prop_seq)
 {
   ACE_CString name;
 
@@ -34,7 +34,7 @@ TAO_NS_PropertySeq::init (const CosNotification::PropertySeq& prop_seq)
 }
 
 int
-TAO_NS_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq)
+TAO_Notify_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq)
 {
   PROPERTY_MAP::ITERATOR iterator (this->property_map_);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index 729742add8d..cb2d9e14a5b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROPERTYSEQ_H
-#define TAO_NS_PROPERTYSEQ_H
+#ifndef TAO_Notify_PROPERTYSEQ_H
+#define TAO_Notify_PROPERTYSEQ_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,19 +24,19 @@
 #include "ace/SString.h"
 
 /**
- * @class TAO_NS_PropertySeq
+ * @class TAO_Notify_PropertySeq
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_PropertySeq
+class TAO_Notify_Export TAO_Notify_PropertySeq
 {
 public:
   /// Constuctor
-  TAO_NS_PropertySeq (void);
+  TAO_Notify_PropertySeq (void);
 
   /// Destructor
-  ~TAO_NS_PropertySeq ();
+  ~TAO_Notify_PropertySeq ();
 
   /// Return 0 on success, -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq);
@@ -59,4 +59,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROPERTYSEQ_H */
+#endif /* TAO_Notify_PROPERTYSEQ_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
index ade45a1057e..0998ec76b1b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 ACE_INLINE int
-TAO_NS_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const
+TAO_Notify_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const
 {
   ACE_CString str_name (name);
   return this->property_map_.find (str_name, value);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index 5615477c391..6428fec8072 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -6,22 +6,22 @@
 #include "Property_Boolean.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Property_Boolean, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$")
 
 #include "PropertySeq.h"
 
-TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const char* name)
+TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
-TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const char* name, CORBA::Boolean initial)
+TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name, CORBA::Boolean initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 int
-TAO_NS_Property_Boolean::set (const TAO_NS_PropertySeq& property_seq)
+TAO_Notify_Property_Boolean::set (const TAO_Notify_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
@@ -34,7 +34,7 @@ TAO_NS_Property_Boolean::set (const TAO_NS_PropertySeq& property_seq)
 }
 
 void
-TAO_NS_Property_Boolean::get (CosNotification::PropertySeq& prop_seq)
+TAO_Notify_Property_Boolean::get (CosNotification::PropertySeq& prop_seq)
 {
   /// Make space
   prop_seq.length (prop_seq.length () + 1);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index 9dc617f2493..ddbe817552f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROPERTY_BOOLEAN_H
-#define TAO_NS_PROPERTY_BOOLEAN_H
+#ifndef TAO_Notify_PROPERTY_BOOLEAN_H
+#define TAO_Notify_PROPERTY_BOOLEAN_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -21,30 +21,30 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
-class TAO_NS_PropertySeq;
+class TAO_Notify_PropertySeq;
 
 /**
- * @class TAO_NS_Property_Boolean
+ * @class TAO_Notify_Property_Boolean
  *
  * @brief Boolean Property.
  *
  */
 /*******************************************************************************/
 
-class TAO_Notify_Export TAO_NS_Property_Boolean
+class TAO_Notify_Export TAO_Notify_Property_Boolean
 {
 public:
   /// Constuctor
-  TAO_NS_Property_Boolean (const char* name, CORBA::Boolean initial);
+  TAO_Notify_Property_Boolean (const char* name, CORBA::Boolean initial);
 
   /// Constuctor
-  TAO_NS_Property_Boolean (const char* name);
+  TAO_Notify_Property_Boolean (const char* name);
 
-  /// Assignment from TAO_NS_Property_Boolean
-  TAO_NS_Property_Boolean& operator= (const TAO_NS_Property_Boolean& rhs);
+  /// Assignment from TAO_Notify_Property_Boolean
+  TAO_Notify_Property_Boolean& operator= (const TAO_Notify_Property_Boolean& rhs);
 
   /// Assignment from CORBA::Boolean
-  TAO_NS_Property_Boolean& operator= (const CORBA::Boolean& rhs);
+  TAO_Notify_Property_Boolean& operator= (const CORBA::Boolean& rhs);
 
   /// Equality comparison operator.
   int operator== (const CORBA::Boolean &rhs) const;
@@ -52,7 +52,7 @@ public:
   /// Inequality comparison operator.
   int operator!= (const CORBA::Boolean &rhs) const;
 
-  int set (const TAO_NS_PropertySeq& property_seq);
+  int set (const TAO_Notify_PropertySeq& property_seq);
 
   void get (CosNotification::PropertySeq& prop_seq);
 
@@ -78,4 +78,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROPERTY_BOOLEAN_H */
+#endif /* TAO_Notify_PROPERTY_BOOLEAN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
index d30cabb4e39..3e8e3ee6a4c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
@@ -1,7 +1,7 @@
 // $Id$
 
-ACE_INLINE TAO_NS_Property_Boolean&
-TAO_NS_Property_Boolean::operator= (const TAO_NS_Property_Boolean& rhs)
+ACE_INLINE TAO_Notify_Property_Boolean&
+TAO_Notify_Property_Boolean::operator= (const TAO_Notify_Property_Boolean& rhs)
 {
   if (this == &rhs)
     return *this;
@@ -16,8 +16,8 @@ TAO_NS_Property_Boolean::operator= (const TAO_NS_Property_Boolean& rhs)
   return *this;
 }
 
-ACE_INLINE TAO_NS_Property_Boolean&
-TAO_NS_Property_Boolean::operator= (const CORBA::Boolean& value)
+ACE_INLINE TAO_Notify_Property_Boolean&
+TAO_Notify_Property_Boolean::operator= (const CORBA::Boolean& value)
 {
   this->value_ = value;
 
@@ -25,25 +25,25 @@ TAO_NS_Property_Boolean::operator= (const CORBA::Boolean& value)
 }
 
 ACE_INLINE int
-TAO_NS_Property_Boolean::operator== (const CORBA::Boolean &rhs) const
+TAO_Notify_Property_Boolean::operator== (const CORBA::Boolean &rhs) const
 {
   return (this->value_ == rhs);
 }
 
 ACE_INLINE int
-TAO_NS_Property_Boolean::operator!= (const CORBA::Boolean &rhs) const
+TAO_Notify_Property_Boolean::operator!= (const CORBA::Boolean &rhs) const
 {
   return (this->value_ != rhs);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Property_Boolean::value (void) const
+TAO_Notify_Property_Boolean::value (void) const
 {
   return this->value_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Property_Boolean::is_valid (void) const
+TAO_Notify_Property_Boolean::is_valid (void) const
 {
   return this->valid_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index a124c957046..fb5245372a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_PROPERTY_T_CPP
-#define TAO_NS_PROPERTY_T_CPP
+#ifndef TAO_Notify_PROPERTY_T_CPP
+#define TAO_Notify_PROPERTY_T_CPP
 
 #include "Property_T.h"
 
@@ -9,26 +9,26 @@
 #include "Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Property_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Property_T, "$Id$")
 
 #include "PropertySeq.h"
 
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const char* name)
+TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const char* name, const TYPE& initial)
+TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const TAO_NS_PropertyBase_T &rhs)
+TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs)
 :name_ (rhs.name_),
  value_ (rhs.value_),
  valid_ (rhs.valid_)
@@ -37,12 +37,12 @@ TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const TAO_NS_PropertyBase_T
 }
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::~TAO_NS_PropertyBase_T ()
+TAO_Notify_PropertyBase_T<TYPE>::~TAO_Notify_PropertyBase_T ()
 {
 }
 
 template <class TYPE> void
-TAO_NS_PropertyBase_T<TYPE>::get (CosNotification::PropertySeq& prop_seq)
+TAO_Notify_PropertyBase_T<TYPE>::get (CosNotification::PropertySeq& prop_seq)
 {
   /// Make space
   prop_seq.length (prop_seq.length () + 1);
@@ -53,19 +53,19 @@ TAO_NS_PropertyBase_T<TYPE>::get (CosNotification::PropertySeq& prop_seq)
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const char* name)
-  :TAO_NS_PropertyBase_T <TYPE> (name)
+TAO_Notify_Property_T<TYPE>::TAO_Notify_Property_T (const char* name)
+  :TAO_Notify_PropertyBase_T <TYPE> (name)
 {
 }
 
 template <class TYPE>
-TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const char* name, const TYPE& initial)
-  :TAO_NS_PropertyBase_T <TYPE> (name, initial)
+TAO_Notify_Property_T<TYPE>::TAO_Notify_Property_T (const char* name, const TYPE& initial)
+  :TAO_Notify_PropertyBase_T <TYPE> (name, initial)
 {
 }
 
 template <class TYPE> int
-TAO_NS_Property_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
+TAO_Notify_Property_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
@@ -80,7 +80,7 @@ TAO_NS_Property_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
 }
 
 template <class TYPE> int
-TAO_NS_Property_T<TYPE>::set(const CosNotification::PropertyValue &value)
+TAO_Notify_Property_T<TYPE>::set(const CosNotification::PropertyValue &value)
 {
   if (value >>= this->value_)
   {
@@ -94,19 +94,19 @@ TAO_NS_Property_T<TYPE>::set(const CosNotification::PropertyValue &value)
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const char* name)
+TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
-TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const char* name, const TYPE& initial)
+TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name, const TYPE& initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 template <class TYPE> int
-TAO_NS_StructProperty_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
+TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
@@ -126,4 +126,4 @@ TAO_NS_StructProperty_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
   return -1;
 }
 
-#endif /* TAO_NS_PROPERTY_T_CPP */
+#endif /* TAO_Notify_PROPERTY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 2d35ac4f475..8009b253da3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROPERTY_T_H
-#define TAO_NS_PROPERTY_T_H
+#ifndef TAO_Notify_PROPERTY_T_H
+#define TAO_Notify_PROPERTY_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,35 +22,35 @@
 #include "ace/SString.h"
 #include "orbsvcs/CosNotificationC.h"
 
-class TAO_NS_PropertySeq;
+class TAO_Notify_PropertySeq;
 
 /**
- * @class TAO_NS_PropertyBase_T
+ * @class TAO_Notify_PropertyBase_T
  *
  * @brief
  *
  */
 template <class TYPE>
-class TAO_NS_PropertyBase_T
+class TAO_Notify_PropertyBase_T
 {
 public:
   /// Constuctor
-  TAO_NS_PropertyBase_T (const char* name, const TYPE& initial);
+  TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_PropertyBase_T (const char* name);
+  TAO_Notify_PropertyBase_T (const char* name);
 
   /// Copy Constuctor
-  TAO_NS_PropertyBase_T (const TAO_NS_PropertyBase_T &rhs);
+  TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs);
 
   /// Destructor
-  ~TAO_NS_PropertyBase_T ();
+  ~TAO_Notify_PropertyBase_T ();
 
-  /// Assignment from TAO_NS_PropertyBase_T
-  // TAO_NS_PropertyBase_T& operator= (const TAO_NS_PropertyBase_T& rhs);
+  /// Assignment from TAO_Notify_PropertyBase_T
+  // TAO_Notify_PropertyBase_T& operator= (const TAO_Notify_PropertyBase_T& rhs);
 
   /// Assignment from TYPE
-  TAO_NS_PropertyBase_T& operator= (const TYPE& rhs);
+  TAO_Notify_PropertyBase_T& operator= (const TYPE& rhs);
 
   /// Equality comparison operator.
   int operator== (const TYPE &rhs) const;
@@ -81,33 +81,33 @@ protected:
   CORBA::Boolean valid_;
 
 private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_NS_PropertyBase_T& operator= (const TAO_NS_PropertyBase_T& rhs))
+  ACE_UNIMPLEMENTED_FUNC (TAO_Notify_PropertyBase_T& operator= (const TAO_Notify_PropertyBase_T& rhs))
 };
 
 
 /*******************************************************************************/
 /**
- * @class TAO_NS_Property_T
+ * @class TAO_Notify_Property_T
  *
  * @brief
  *
  */
 template <class TYPE>
-class TAO_NS_Property_T : public TAO_NS_PropertyBase_T<TYPE>
+class TAO_Notify_Property_T : public TAO_Notify_PropertyBase_T<TYPE>
 {
 public:
   /// Constuctor
-  TAO_NS_Property_T (const char* name, const TYPE& initial);
+  TAO_Notify_Property_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_Property_T (const char* name);
+  TAO_Notify_Property_T (const char* name);
 
   /// Assignment from TYPE
-  TAO_NS_Property_T& operator= (const TYPE& rhs);
+  TAO_Notify_Property_T& operator= (const TYPE& rhs);
 
   /// Init this Property from the sequence.
   /// Returns 0 on success, -1 on error
-  int set (const TAO_NS_PropertySeq& property_seq);
+  int set (const TAO_Notify_PropertySeq& property_seq);
 
   /// Init this Property from the CosNotification::PropertyValue
   /// Returns 0 on success, -1 on error
@@ -116,24 +116,24 @@ public:
 
 /*******************************************************************************/
 /**
- * @class TAO_NS_StructProperty_T
+ * @class TAO_Notify_StructProperty_T
  *
  * @brief
  *
  */
 template <class TYPE>
-class TAO_NS_StructProperty_T
+class TAO_Notify_StructProperty_T
 {
 public:
   /// Constuctor
-  TAO_NS_StructProperty_T (const char* name, const TYPE& initial);
+  TAO_Notify_StructProperty_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_StructProperty_T (const char* name);
+  TAO_Notify_StructProperty_T (const char* name);
 
   /// Init this Property from the sequence.
   /// Returns 0 on success, -1 on error
-  int set (const TAO_NS_PropertySeq& property_seq);
+  int set (const TAO_Notify_PropertySeq& property_seq);
 
   /// Return the value.
   const TYPE& value (void) const;
@@ -165,4 +165,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROPERTY_T_H */
+#endif /* TAO_Notify_PROPERTY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index ab195431b22..33bcd4c8c61 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -1,31 +1,31 @@
 // $Id$
 
 template <class TYPE> ACE_INLINE const TYPE&
-TAO_NS_PropertyBase_T<TYPE>::value (void) const
+TAO_Notify_PropertyBase_T<TYPE>::value (void) const
 {
   return this->value_;
 }
 
 template <class TYPE> ACE_INLINE CORBA::Boolean
-TAO_NS_PropertyBase_T<TYPE>::is_valid (void) const
+TAO_Notify_PropertyBase_T<TYPE>::is_valid (void) const
 {
   return this->valid_;
 }
 
 template <class TYPE> ACE_INLINE int
-TAO_NS_PropertyBase_T<TYPE>::operator== (const TYPE &rhs) const
+TAO_Notify_PropertyBase_T<TYPE>::operator== (const TYPE &rhs) const
 {
   return (this->value_ == rhs);
 }
 
 template <class TYPE> ACE_INLINE int
-TAO_NS_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const
+TAO_Notify_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const
 {
   return (this->value_ != rhs);
 }
 
-template <class TYPE> ACE_INLINE TAO_NS_PropertyBase_T<TYPE>&
-TAO_NS_PropertyBase_T<TYPE>::operator=(const TYPE& value)
+template <class TYPE> ACE_INLINE TAO_Notify_PropertyBase_T<TYPE>&
+TAO_Notify_PropertyBase_T<TYPE>::operator=(const TYPE& value)
 {
   this->value_ = value;
 
@@ -33,30 +33,30 @@ TAO_NS_PropertyBase_T<TYPE>::operator=(const TYPE& value)
 }
 
 template <class TYPE> ACE_INLINE void
-TAO_NS_PropertyBase_T<TYPE>:: invalidate (void)
+TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void)
 {
   this->valid_ = 0;
 }
 
 /******************************************************************************/
 
-template <class TYPE> ACE_INLINE TAO_NS_Property_T<TYPE>&
-TAO_NS_Property_T<TYPE>::operator=(const TYPE& value)
+template <class TYPE> ACE_INLINE TAO_Notify_Property_T<TYPE>&
+TAO_Notify_Property_T<TYPE>::operator=(const TYPE& value)
 {
-  this->TAO_NS_PropertyBase_T<TYPE>::operator= (value);
+  this->TAO_Notify_PropertyBase_T<TYPE>::operator= (value);
   return *this;
 }
 
 /******************************************************************************/
 
 template <class TYPE> ACE_INLINE const TYPE&
-TAO_NS_StructProperty_T<TYPE>::value (void) const
+TAO_Notify_StructProperty_T<TYPE>::value (void) const
 {
   return this->value_;
 }
 
 template <class TYPE> ACE_INLINE CORBA::Boolean
-TAO_NS_StructProperty_T<TYPE>::is_valid (void) const
+TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const
 {
   return this->valid_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 5e29ea6fdc6..e09ad26a545 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -6,7 +6,7 @@
 #include "Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_Proxy, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$")
 
 #include "Peer.h"
 #include "Proxy.h"
@@ -15,17 +15,17 @@ ACE_RCSID(RT_Notify, TAO_NS_Proxy, "$Id$")
 #include "Properties.h"
 #include "POA_Helper.h"
 
-TAO_NS_Proxy::TAO_NS_Proxy (void)
+TAO_Notify_Proxy::TAO_Notify_Proxy (void)
   :updates_off_ (0)
 {
 }
 
-TAO_NS_Proxy::~TAO_NS_Proxy ()
+TAO_Notify_Proxy::~TAO_Notify_Proxy ()
 {
 }
 
 CORBA::Object_ptr
-TAO_NS_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   // Set the POA that we use to return our <ref>
   this->poa_ = this->proxy_poa_;
@@ -34,13 +34,13 @@ TAO_NS_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_Proxy::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Proxy::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
@@ -51,11 +51,11 @@ TAO_NS_Proxy::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_AR
 }
 
 void
-TAO_NS_Proxy::types_changed (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Updates_No_Copy request (added, removed, this);
+  TAO_Notify_Method_Request_Updates_No_Copy request (added, removed, this);
 
-  if (TAO_NS_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
+  if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
     {
       this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
     }
@@ -66,7 +66,7 @@ TAO_NS_Proxy::types_changed (const TAO_NS_EventTypeSeq& added, const TAO_NS_Even
 }
 
 CosNotification::EventTypeSeq*
-TAO_NS_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_NS_EventTypeSeq& types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -100,10 +100,10 @@ TAO_NS_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TA
 }
 
 void
-TAO_NS_Proxy::qos_changed (const TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_Proxy::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 {
   //Inform Peers of qos changes.
-  TAO_NS_Peer* peer = this->peer ();
+  TAO_Notify_Peer* peer = this->peer ();
 
   if (peer != 0)
     peer->qos_changed (qos_properties);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 9e767d25f4f..e8ddadcc05c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXY_H
-#define TAO_NS_PROXY_H
+#ifndef TAO_Notify_PROXY_H
+#define TAO_Notify_PROXY_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,28 +25,28 @@
 #include "Admin.h"
 #include "Refcountable_Guard_T.h"
 
-class TAO_NS_Admin;
-class TAO_NS_Peer;
+class TAO_Notify_Admin;
+class TAO_Notify_Peer;
 
 /**
- * @class TAO_NS_Proxy
+ * @class TAO_Notify_Proxy
  *
  * @brief Base class proxy for all proxys in NS.
  *
  */
-class TAO_Notify_Export TAO_NS_Proxy : public virtual TAO_NS_Object
+class TAO_Notify_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object
 {
-  friend class TAO_NS_Peer;
+  friend class TAO_Notify_Peer;
 
 public:
   typedef CosNotifyChannelAdmin::ProxyIDSeq SEQ;
   typedef CosNotifyChannelAdmin::ProxyIDSeq_var SEQ_VAR;
 
   /// Constuctor
-  TAO_NS_Proxy (void);
+  TAO_Notify_Proxy (void);
 
   /// Destructor
-  ~TAO_NS_Proxy ();
+  ~TAO_Notify_Proxy ();
 
   /// Activate
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
@@ -55,22 +55,22 @@ public:
   void deactivate (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain the Proxy's subscribed types.
-  void subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL);
 
   /// Check if this event passes the admin and proxy filters.
-  CORBA::Boolean check_filters (const TAO_NS_Event* event
-                                , TAO_NS_FilterAdmin& parent_filter_admin
+  CORBA::Boolean check_filters (const TAO_Notify_Event* event
+                                , TAO_Notify_FilterAdmin& parent_filter_admin
                                 , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
                                 ACE_ENV_ARG_DECL);
 
   /// Check if this event passes the admin and proxy filters.
-  CORBA::Boolean check_filters (const TAO_NS_Event_var &event
-                                , TAO_NS_FilterAdmin& parent_filter_admin
+  CORBA::Boolean check_filters (const TAO_Notify_Event_var &event
+                                , TAO_Notify_FilterAdmin& parent_filter_admin
                                 , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
                                 ACE_ENV_ARG_DECL);
 
   /// Inform this proxy that the following types are being advertised.
-  void types_changed (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
 
   /// Have updates been turned off.
   CORBA::Boolean updates_off (void);
@@ -79,10 +79,10 @@ public:
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Access our Peer.
-  virtual TAO_NS_Peer* peer (void) = 0;
+  virtual TAO_Notify_Peer* peer (void) = 0;
 
   /// Implement the Obtain Types.
-  virtual CosNotification::EventTypeSeq* obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_NS_EventTypeSeq& types ACE_ENV_ARG_DECL)
+  virtual CosNotification::EventTypeSeq* obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -93,26 +93,26 @@ public:
                                     ACE_ENV_ARG_DECL) = 0;
 
 
-  /// Override, TAO_NS_Object::qos_changed
-  virtual void qos_changed (const TAO_NS_QoSProperties& qos_properties);
+  /// Override, TAO_Notify_Object::qos_changed
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
 protected:
 
   /// Filter Administration
-  TAO_NS_FilterAdmin filter_admin_;
+  TAO_Notify_FilterAdmin filter_admin_;
 
   /// The types that we're subscribed with the event manager.
-  TAO_NS_EventTypeSeq subscribed_types_;
+  TAO_Notify_EventTypeSeq subscribed_types_;
 
   /// True if updates have been turned off.
   CORBA::Boolean updates_off_;
 };
 
-typedef TAO_NS_Refcountable_Guard_T<TAO_NS_Proxy> TAO_NS_Proxy_Guard;
+typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Guard;
 
 #if defined (__ACE_INLINE__)
 #include "Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXY_H */
+#endif /* TAO_Notify_PROXY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 1d74171a622..e7bcc8907f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -1,14 +1,14 @@
 // $Id$
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Proxy::updates_off (void)
+TAO_Notify_Proxy::updates_off (void)
 {
   return this->updates_off_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Proxy::check_filters (const TAO_NS_Event_var &event
-                             , TAO_NS_FilterAdmin& parent_filter_admin
+TAO_Notify_Proxy::check_filters (const TAO_Notify_Event_var &event
+                             , TAO_Notify_FilterAdmin& parent_filter_admin
                              , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
                              ACE_ENV_ARG_DECL)
 {
@@ -16,8 +16,8 @@ TAO_NS_Proxy::check_filters (const TAO_NS_Event_var &event
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_NS_Proxy::check_filters (const TAO_NS_Event* event
-                             , TAO_NS_FilterAdmin& parent_filter_admin
+TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
+                             , TAO_Notify_FilterAdmin& parent_filter_admin
                              , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
                              ACE_ENV_ARG_DECL)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 445c47ff2b7..1675a777de5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -6,7 +6,7 @@
 #include "ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_ProxyConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$")
 
 #include "tao/debug.h"
 #include "ace/Atomic_Op.h"
@@ -20,47 +20,47 @@ ACE_RCSID(RT_Notify, TAO_NS_ProxyConsumer, "$Id$")
 #include "Properties.h"
 #include "SupplierAdmin.h"
 
-TAO_NS_ProxyConsumer::TAO_NS_ProxyConsumer (void)
+TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void)
   : supplier_admin_ (0)
   , supplier_ (0)
 {
 }
 
-TAO_NS_ProxyConsumer::~TAO_NS_ProxyConsumer ()
+TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer ()
 {
   this->supplier_admin_->_decr_refcnt ();
 }
 
-TAO_NS_Peer*
-TAO_NS_ProxyConsumer::peer (void)
+TAO_Notify_Peer*
+TAO_Notify_ProxyConsumer::peer (void)
 {
   return this->supplier ();
 }
 
 void
-TAO_NS_ProxyConsumer::init (TAO_NS_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Object::init (supplier_admin);
+  TAO_Notify_Object::init (supplier_admin);
 
   this->supplier_admin_ = supplier_admin;
 
   this->supplier_admin_->_incr_refcnt ();
 
   const CosNotification::QoSProperties &default_ps_qos =
-    TAO_NS_PROPERTIES::instance ()->default_proxy_consumer_qos_properties ();
+    TAO_Notify_PROPERTIES::instance ()->default_proxy_consumer_qos_properties ();
 
   this->set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxyConsumer::connect (TAO_NS_Supplier *supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
-  TAO_NS_Atomic_Property_Long& supplier_count = this->admin_properties_->suppliers ();
-  const TAO_NS_Property_Long& max_suppliers = this->admin_properties_->max_suppliers ();
+  TAO_Notify_Atomic_Property_Long& supplier_count = this->admin_properties_->suppliers ();
+  const TAO_Notify_Property_Long& max_suppliers = this->admin_properties_->max_suppliers ();
 
   if (max_suppliers != 0 &&
       supplier_count >= max_suppliers.value ())
@@ -86,7 +86,7 @@ TAO_NS_ProxyConsumer::connect (TAO_NS_Supplier *supplier ACE_ENV_ARG_DECL)
   // Inform QoS values.
   supplier_->qos_changed (this->qos_properties_);
 
-  TAO_NS_EventTypeSeq removed;
+  TAO_Notify_EventTypeSeq removed;
 
   this->event_manager_->offer_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -99,9 +99,9 @@ TAO_NS_ProxyConsumer::connect (TAO_NS_Supplier *supplier ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq added;
+  TAO_Notify_EventTypeSeq added;
 
   event_manager_->offer_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -114,9 +114,9 @@ TAO_NS_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_NS_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   ACE_CHECK_RETURN (1);
@@ -131,7 +131,7 @@ TAO_NS_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -144,10 +144,10 @@ TAO_NS_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer>;
+template class TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer>
+#pragma instantiate TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 90b556fd55c..e89477ab270 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYCONSUMER_H
-#define TAO_NS_PROXYCONSUMER_H
+#ifndef TAO_Notify_PROXYCONSUMER_H
+#define TAO_Notify_PROXYCONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -26,29 +26,29 @@
 #include "Proxy.h"
 
 
-class TAO_NS_SupplierAdmin;
-class TAO_NS_Supplier;
+class TAO_Notify_SupplierAdmin;
+class TAO_Notify_Supplier;
 
 /**
- * @class TAO_NS_ProxyConsumer
+ * @class TAO_Notify_ProxyConsumer
  *
  * @brief Base class for all types of ProxyConsumer implementations.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyConsumer : public virtual TAO_NS_Proxy
+class TAO_Notify_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy
 {
 public:
   /// Constuctor
-  TAO_NS_ProxyConsumer (void);
+  TAO_Notify_ProxyConsumer (void);
 
   /// Destructor
-  ~TAO_NS_ProxyConsumer ();
+  ~TAO_Notify_ProxyConsumer ();
 
   /// Init
-  void init (TAO_NS_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
 
   /// Connect
-  void connect (TAO_NS_Supplier* supplier ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
@@ -57,38 +57,38 @@ public:
   /// Disconnect
   void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Shutdown  (TAO_NS_Container_T method)
+  /// Shutdown  (TAO_Notify_Container_T method)
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Access our Peer.
-  virtual TAO_NS_Peer* peer (void);
+  virtual TAO_Notify_Peer* peer (void);
 
   /// Access the Supplier
-  TAO_NS_Supplier* supplier (void);
+  TAO_Notify_Supplier* supplier (void);
 
   /// Return 1 if connected
   int is_connected (void);
 
   /// The SA parent.
-  TAO_NS_SupplierAdmin* supplier_admin (void);
+  TAO_Notify_SupplierAdmin* supplier_admin (void);
 
 protected:
   ///= Data Members.
   /// The SA parent.
-  TAO_NS_SupplierAdmin* supplier_admin_;
+  TAO_Notify_SupplierAdmin* supplier_admin_;
 
   /// The Supplier that we're connect to.
-  TAO_NS_Supplier* supplier_;
+  TAO_Notify_Supplier* supplier_;
 };
 
-typedef TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer> TAO_NS_ProxyConsumer_Guard;
+typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> TAO_Notify_ProxyConsumer_Guard;
 
 #if defined (__ACE_INLINE__)
 #include "ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYCONSUMER_H */
+#endif /* TAO_Notify_PROXYCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
index ea4b07f8474..14843a741a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
@@ -1,19 +1,19 @@
 // $Id$
 
 ACE_INLINE int
-TAO_NS_ProxyConsumer::is_connected (void)
+TAO_Notify_ProxyConsumer::is_connected (void)
 {
   return supplier_ == 0 ? 0 : 1;
 }
 
-ACE_INLINE TAO_NS_Supplier*
-TAO_NS_ProxyConsumer::supplier (void)
+ACE_INLINE TAO_Notify_Supplier*
+TAO_Notify_ProxyConsumer::supplier (void)
 {
   return this->supplier_;
 }
 
-ACE_INLINE TAO_NS_SupplierAdmin*
-TAO_NS_ProxyConsumer::supplier_admin (void)
+ACE_INLINE TAO_Notify_SupplierAdmin*
+TAO_Notify_ProxyConsumer::supplier_admin (void)
 {
   return this->supplier_admin_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 59ea1b47f4a..d9e90b412cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_PROXYCONSUMER_T_CPP
-#define TAO_NS_PROXYCONSUMER_T_CPP
+#ifndef TAO_Notify_PROXYCONSUMER_T_CPP
+#define TAO_Notify_PROXYCONSUMER_T_CPP
 
 #include "ProxyConsumer_T.h"
 #include "SupplierAdmin.h"
@@ -10,22 +10,22 @@
 #include "ProxyConsumer_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ProxyConsumer_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$")
 
 #include "Event_Manager.h"
 
 template <class SERVANT_TYPE>
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::TAO_NS_ProxyConsumer_T (void)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void)
 {
 }
 
 template <class SERVANT_TYPE>
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::~TAO_NS_ProxyConsumer_T ()
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer_T ()
 {
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
                                                            const CosNotification::EventTypeSeq & removed
                                                            ACE_ENV_ARG_DECL)
 {
@@ -33,7 +33,7 @@ TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotification
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -49,14 +49,14 @@ TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
-  TAO_NS_EventTypeSeq seq_added (added);
-  TAO_NS_EventTypeSeq seq_removed (removed);
+  TAO_Notify_EventTypeSeq seq_added (added);
+  TAO_Notify_EventTypeSeq seq_removed (removed);
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -70,7 +70,7 @@ TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::Event
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -78,4 +78,4 @@ TAO_NS_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChanne
   return this->obtain_types (mode, this->event_manager_->subscription_types () ACE_ENV_ARG_PARAMETER);
 }
 
-#endif /* TAO_NS_PROXYCONSUMER_T_CPP */
+#endif /* TAO_Notify_PROXYCONSUMER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 6ccc7dcec1d..43fcc2c5cbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYCONSUMER_T_H
-#define TAO_NS_PROXYCONSUMER_T_H
+#ifndef TAO_Notify_PROXYCONSUMER_T_H
+#define TAO_Notify_PROXYCONSUMER_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,20 +23,20 @@
 #include "ProxyConsumer.h"
 
 /**
- * @class TAO_NS_ProxyConsumer_T
+ * @class TAO_Notify_ProxyConsumer_T
  *
  * @brief
  *
  */
 template <class SERVANT_TYPE>
-class TAO_Notify_Export TAO_NS_ProxyConsumer_T : public virtual TAO_NS_Proxy_T <SERVANT_TYPE>, public virtual TAO_NS_ProxyConsumer
+class TAO_Notify_Export TAO_Notify_ProxyConsumer_T : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, public virtual TAO_Notify_ProxyConsumer
 {
 public:
   /// Constuctor
-  TAO_NS_ProxyConsumer_T (void);
+  TAO_Notify_ProxyConsumer_T (void);
 
   /// Destructor
-  ~TAO_NS_ProxyConsumer_T ();
+  ~TAO_Notify_ProxyConsumer_T ();
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
@@ -81,4 +81,4 @@ public:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYCONSUMER_T_H */
+#endif /* TAO_Notify_PROXYCONSUMER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index c8d169267cd..3034ae07829 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -6,7 +6,7 @@
 #include "ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_ProxySupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$")
 
 #include "Event_Manager.h"
 #include "AdminProperties.h"
@@ -17,47 +17,47 @@ ACE_RCSID(RT_Notify, TAO_NS_ProxySupplier, "$Id$")
 #include "Properties.h"
 #include "ConsumerAdmin.h"
 
-TAO_NS_ProxySupplier::TAO_NS_ProxySupplier (void)
+TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void)
   : consumer_admin_ (0)
   , consumer_ (0)
 {
 }
 
-TAO_NS_ProxySupplier::~TAO_NS_ProxySupplier ()
+TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 {
   this->consumer_admin_->_decr_refcnt ();
 }
 
 void
-TAO_NS_ProxySupplier::init (TAO_NS_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Object::init (consumer_admin);
+  TAO_Notify_Object::init (consumer_admin);
 
   this->consumer_admin_ = consumer_admin;
 
   this->consumer_admin_->_incr_refcnt ();
 
   const CosNotification::QoSProperties &default_ps_qos =
-    TAO_NS_PROPERTIES::instance ()->default_proxy_supplier_qos_properties ();
+    TAO_Notify_PROPERTIES::instance ()->default_proxy_supplier_qos_properties ();
 
   this->set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_NS_Peer*
-TAO_NS_ProxySupplier:: peer (void)
+TAO_Notify_Peer*
+TAO_Notify_ProxySupplier:: peer (void)
 {
   return this->consumer ();
 }
 
 void
-TAO_NS_ProxySupplier::connect (TAO_NS_Consumer *consumer ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
-  TAO_NS_Atomic_Property_Long& consumer_count = this->admin_properties_->consumers ();
-  const TAO_NS_Property_Long& max_consumers = this->admin_properties_->max_consumers ();
+  TAO_Notify_Atomic_Property_Long& consumer_count = this->admin_properties_->consumers ();
+  const TAO_Notify_Property_Long& max_consumers = this->admin_properties_->max_consumers ();
 
   if (max_consumers != 0 &&
       consumer_count >= max_consumers.value ())
@@ -83,7 +83,7 @@ TAO_NS_ProxySupplier::connect (TAO_NS_Consumer *consumer ACE_ENV_ARG_DECL)
   // Inform QoS values.
   consumer_->qos_changed (this->qos_properties_);
 
-  TAO_NS_EventTypeSeq removed;
+  TAO_Notify_EventTypeSeq removed;
 
   this->event_manager_->subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
 
@@ -95,9 +95,9 @@ TAO_NS_ProxySupplier::connect (TAO_NS_Consumer *consumer ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_ProxySupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_EventTypeSeq added;
+  TAO_Notify_EventTypeSeq added;
 
   this->event_manager_->subscription_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -110,9 +110,9 @@ TAO_NS_ProxySupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_NS_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   ACE_CHECK_RETURN (1);
@@ -127,7 +127,7 @@ TAO_NS_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -139,48 +139,48 @@ TAO_NS_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ProxySupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch_No_Copy request (event, this, 1);
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (event, this, 1);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxySupplier::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch_No_Copy_Ex request (event, this, 1);
+  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex request (event, this, 1);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxySupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch_No_Copy request (event, this, 0); // No filtering.
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (event, this, 0); // No filtering.
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxySupplier::push_no_filtering (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::push_no_filtering (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch_No_Copy_Ex request (event, this, 0); // No filtering.
+  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex request (event, this, 0); // No filtering.
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxySupplier::qos_changed (const TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 {
-  TAO_NS_Property_Long mepc_qos (CosNotification::MaxEventsPerConsumer);
+  TAO_Notify_Property_Long mepc_qos (CosNotification::MaxEventsPerConsumer);
 
   if (mepc_qos.set (qos_properties) != -1)
     {
       // Does the Proxy own the Worker Task?
       if (own_worker_task_)
         {
-          TAO_NS_Buffering_Strategy* bs = this->worker_task_->buffering_strategy ();
+          TAO_Notify_Buffering_Strategy* bs = this->worker_task_->buffering_strategy ();
 
           // Apply this QoS to the Proxy's Buffering Strategy.
           if (bs)
@@ -190,16 +190,16 @@ TAO_NS_ProxySupplier::qos_changed (const TAO_NS_QoSProperties& qos_properties)
         }
     }
 
-  TAO_NS_Proxy::qos_changed (qos_properties);
+  TAO_Notify_Proxy::qos_changed (qos_properties);
 }
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier>;
+template class TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier>
+#pragma instantiate TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 1e8ee3c7bed..aeba813d53c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYSUPPLIER_H
-#define TAO_NS_PROXYSUPPLIER_H
+#ifndef TAO_Notify_PROXYSUPPLIER_H
+#define TAO_Notify_PROXYSUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,31 +24,31 @@
 #include "Refcountable_Guard_T.h"
 #include "orbsvcs/CosEventChannelAdminC.h"
 
-class TAO_NS_Consumer;
-class TAO_NS_ConsumerAdmin;
+class TAO_Notify_Consumer;
+class TAO_Notify_ConsumerAdmin;
 
 /**
- * @class TAO_NS_ProxySupplier
+ * @class TAO_Notify_ProxySupplier
  *
  * @brief Base class for all the ProxySuppliers.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxySupplier : public virtual TAO_NS_Proxy
+class TAO_Notify_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy
 {
-  friend class TAO_NS_Consumer;
+  friend class TAO_Notify_Consumer;
 
 public:
   /// Constuctor
-  TAO_NS_ProxySupplier (void);
+  TAO_Notify_ProxySupplier (void);
 
   /// Destructor
-  virtual ~TAO_NS_ProxySupplier ();
+  virtual ~TAO_Notify_ProxySupplier ();
 
   /// Init
-  virtual void init (TAO_NS_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
 
   /// Connect
-  void connect (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
@@ -57,53 +57,53 @@ public:
   void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
-  /// Override TAO_NS_Container_T::shutdown  method
+  /// Override TAO_Notify_Container_T::shutdown  method
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Override, TAO_NS_Proxy::qos_changed to apply MaxEventssPerConsumer QoS.
-  virtual void qos_changed (const TAO_NS_QoSProperties& qos_properties);
+  /// Override, TAO_Notify_Proxy::qos_changed to apply MaxEventssPerConsumer QoS.
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Access our Peer.
-  virtual TAO_NS_Peer* peer (void);
+  virtual TAO_Notify_Peer* peer (void);
 
   /// Access the Consumer
-  TAO_NS_Consumer* consumer (void);
+  TAO_Notify_Consumer* consumer (void);
 
   /// Return 1 if connected
   int is_connected (void);
 
   /// The CA parent.
-  TAO_NS_ConsumerAdmin* consumer_admin (void);
+  TAO_Notify_ConsumerAdmin* consumer_admin (void);
 
 protected:
 
   ///= Data Members.
   /// The CA parent.
-  TAO_NS_ConsumerAdmin* consumer_admin_;
+  TAO_Notify_ConsumerAdmin* consumer_admin_;
 
   /// The Consumer that we're connect to.
-  TAO_NS_Consumer* consumer_;
+  TAO_Notify_Consumer* consumer_;
 };
 
-typedef TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier> TAO_NS_ProxySupplier_Guard;
+typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier> TAO_Notify_ProxySupplier_Guard;
 
 #if defined (__ACE_INLINE__)
 #include "ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYSUPPLIER_H */
+#endif /* TAO_Notify_PROXYSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
index 3c7852c9858..3a77cad7734 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
@@ -1,19 +1,19 @@
 // $Id$
 
 ACE_INLINE int
-TAO_NS_ProxySupplier::is_connected (void)
+TAO_Notify_ProxySupplier::is_connected (void)
 {
   return consumer_ == 0 ? 0 : 1;
 }
 
-ACE_INLINE TAO_NS_Consumer*
-TAO_NS_ProxySupplier::consumer (void)
+ACE_INLINE TAO_Notify_Consumer*
+TAO_Notify_ProxySupplier::consumer (void)
 {
   return this->consumer_;
 }
 
-ACE_INLINE TAO_NS_ConsumerAdmin*
-TAO_NS_ProxySupplier::consumer_admin (void)
+ACE_INLINE TAO_Notify_ConsumerAdmin*
+TAO_Notify_ProxySupplier::consumer_admin (void)
 {
   return this->consumer_admin_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 895d44fdb6c..95ce720f7db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_PROXYSUPPLIER_T_C
-#define TAO_NS_PROXYSUPPLIER_T_C
+#ifndef TAO_Notify_PROXYSUPPLIER_T_C
+#define TAO_Notify_PROXYSUPPLIER_T_C
 
 #include "ProxySupplier_T.h"
 
@@ -9,7 +9,7 @@
 #include "ProxySupplier_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ProxySupplier_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$")
 
 #include "Consumer.h"
 #include "Structured/StructuredEvent.h"
@@ -21,18 +21,18 @@ ACE_RCSID(Notify, TAO_NS_ProxySupplier_T, "$Id$")
 #include "ConsumerAdmin.h"
 
 template <class SERVANT_TYPE>
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::TAO_NS_ProxySupplier_T (void)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void)
   :is_suspended_ (0)
 {
 }
 
 template <class SERVANT_TYPE>
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::~TAO_NS_ProxySupplier_T ()
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::~TAO_Notify_ProxySupplier_T ()
 {
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
                                                            const CosNotification::EventTypeSeq & removed
                                                            ACE_ENV_ARG_DECL)
 {
@@ -40,59 +40,59 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_StructuredEvent_No_Copy event (notification);
+  TAO_Notify_StructuredEvent_No_Copy event (notification);
 
-  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 1);
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_StructuredEvent_No_Copy event(notification);
+  TAO_Notify_StructuredEvent_No_Copy event(notification);
 
-  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 0);
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_AnyEvent_No_Copy event (any);
+  TAO_Notify_AnyEvent_No_Copy event (any);
 
-  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 1);
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))
 {
-  TAO_NS_AnyEvent_No_Copy event(any);
+  TAO_Notify_AnyEvent_No_Copy event(any);
 
-  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 0);
+  TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -101,14 +101,14 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmi
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added,
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added,
                                                            const CosNotification::EventTypeSeq & removed
                                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
-  TAO_NS_EventTypeSeq seq_added (added);
-  TAO_NS_EventTypeSeq seq_removed (removed);
+  TAO_Notify_EventTypeSeq seq_added (added);
+  TAO_Notify_EventTypeSeq seq_removed (removed);
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -122,7 +122,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -143,7 +143,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DEC
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -164,7 +164,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -182,7 +182,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
 /***************************** UNIMPLEMENTED METHODS***************************************/
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -192,7 +192,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -201,7 +201,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingF
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -211,7 +211,7 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -219,4 +219,4 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingF
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-#endif /* #define TAO_NS_PROXYSUPPLIER_T_C */
+#endif /* #define TAO_Notify_PROXYSUPPLIER_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index c0e8d2054fb..7632ba29ab7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXYSUPPLIER_T_H
-#define TAO_NS_PROXYSUPPLIER_T_H
+#ifndef TAO_Notify_PROXYSUPPLIER_T_H
+#define TAO_Notify_PROXYSUPPLIER_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,20 +23,20 @@
 #include "ProxySupplier.h"
 
 /**
- * @class TAO_NS_ProxySupplier_T
+ * @class TAO_Notify_ProxySupplier_T
  *
  * @brief
  *
  */
 template <class SERVANT_TYPE>
-class TAO_NS_ProxySupplier_T : public virtual TAO_NS_Proxy_T <SERVANT_TYPE>, public virtual TAO_NS_ProxySupplier
+class TAO_Notify_ProxySupplier_T : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, public virtual TAO_Notify_ProxySupplier
 {
 public:
   /// Constuctor
-  TAO_NS_ProxySupplier_T (void);
+  TAO_Notify_ProxySupplier_T (void);
 
   /// Destructor
-  ~TAO_NS_ProxySupplier_T ();
+  ~TAO_Notify_ProxySupplier_T ();
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
@@ -159,4 +159,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXYSUPPLIER_T_H */
+#endif /* TAO_Notify_PROXYSUPPLIER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 3136b9b6935..d767751adc3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -2,45 +2,45 @@
 
 #include "Proxy_T.h"
 
-#ifndef TAO_NS_PROXY_T_CPP
-#define TAO_NS_PROXY_T_CPP
+#ifndef TAO_Notify_PROXY_T_CPP
+#define TAO_Notify_PROXY_T_CPP
 
 #if ! defined (__ACE_INLINE__)
 #include "Proxy_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Proxy_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$")
 
 template <class SERVANT_TYPE>
-TAO_NS_Proxy_T<SERVANT_TYPE>::TAO_NS_Proxy_T (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void)
 {
 }
 
 template <class SERVANT_TYPE>
-TAO_NS_Proxy_T<SERVANT_TYPE>::~TAO_NS_Proxy_T ()
+TAO_Notify_Proxy_T<SERVANT_TYPE>::~TAO_Notify_Proxy_T ()
 {
 }
 
 template <class SERVANT_TYPE> PortableServer::Servant
-TAO_NS_Proxy_T<SERVANT_TYPE>::servant (void)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::servant (void)
 {
   return this;
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -50,7 +50,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProp
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_NS_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -59,11 +59,11 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -72,11 +72,11 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qo
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->TAO_NS_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::validate_qos (
+TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_qos (
                                             const CosNotification::QoSProperties & /*required_qos*/,
                                             CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
     ACE_ENV_ARG_DECL
@@ -90,7 +90,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::validate_qos (
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
-TAO_NS_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -103,7 +103,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::remove_filter (
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
     CosNotifyFilter::FilterID filter
     ACE_ENV_ARG_DECL
   )
@@ -119,7 +119,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::remove_filter (
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
-TAO_NS_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -133,7 +133,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_E
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_NS_Proxy_T<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -146,7 +146,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -157,4 +157,4 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-#endif /* TAO_NS_PROXY_T_CPP */
+#endif /* TAO_Notify_PROXY_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 090d4edd49a..4b62539570f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PROXY_T_H
-#define TAO_NS_PROXY_T_H
+#ifndef TAO_Notify_PROXY_T_H
+#define TAO_Notify_PROXY_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,7 +22,7 @@
 #include "Proxy.h"
 
 /**
- * @class TAO_NS_Proxy_T
+ * @class TAO_Notify_Proxy_T
  *
  * @brief The is a base class for all proxys , templatized by the servant
  * type. All the Filter Admin and QoS Admin interface methods are
@@ -30,16 +30,16 @@
  *
  */
 template <class SERVANT_TYPE>
-class TAO_NS_Proxy_T : public SERVANT_TYPE, public virtual TAO_NS_Proxy
+class TAO_Notify_Proxy_T : public SERVANT_TYPE, public virtual TAO_Notify_Proxy
 {
 public:
   /// Constuctor
-  TAO_NS_Proxy_T (void);
+  TAO_Notify_Proxy_T (void);
 
   /// Destructor
-  ~TAO_NS_Proxy_T ();
+  ~TAO_Notify_Proxy_T ();
 
-  /// Implements TAO_NS_Object::servant method.
+  /// Implements TAO_Notify_Object::servant method.
   virtual PortableServer::Servant servant (void);
 
   /// ServantBase refcount methods.
@@ -125,21 +125,21 @@ public:
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
+TAO_Notify_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
+TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>;
+TAO_Notify_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
+TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
+TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
+TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
+TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>;
 template class TAO_Notify_Export
-TAO_NS_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
+TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 #if defined (__ACE_INLINE__)
@@ -155,4 +155,4 @@ TAO_NS_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PROXY_T_H */
+#endif /* TAO_Notify_PROXY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 60c229669dd..aeb37b62ba3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -6,11 +6,11 @@
 #include "QoSProperties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_QoSProperties, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$")
 
 #include "Property.h"
 
-TAO_NS_QoSProperties::TAO_NS_QoSProperties (void)
+TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void)
   : priority_ (CosNotification::Priority)
     , timeout_ (CosNotification::Timeout)
     , stop_time_supported_ (CosNotification::StopTimeSupported)
@@ -24,12 +24,12 @@ TAO_NS_QoSProperties::TAO_NS_QoSProperties (void)
   unsupported_[2] = CosNotification::StartTimeSupported;
 }
 
-TAO_NS_QoSProperties::~TAO_NS_QoSProperties ()
+TAO_Notify_QoSProperties::~TAO_Notify_QoSProperties ()
 {
 }
 
 int
-TAO_NS_QoSProperties::unsupported (ACE_CString& name)
+TAO_Notify_QoSProperties::unsupported (ACE_CString& name)
 {
   for (int i = 0; i < UNSUPPORTED_PROPERTY_COUNT; ++i)
     {
@@ -41,7 +41,7 @@ TAO_NS_QoSProperties::unsupported (ACE_CString& name)
 }
 
 int
-TAO_NS_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq)
+TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq)
 {
   int err_index = -1;
 
@@ -79,7 +79,7 @@ TAO_NS_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNot
 }
 
 int
-TAO_NS_QoSProperties::copy (TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_QoSProperties::copy (TAO_Notify_QoSProperties& qos_properties)
 {
   qos_properties.priority_ = this->priority_.value ();
   qos_properties.timeout_ = this->timeout_.value ();
@@ -100,7 +100,7 @@ TAO_NS_QoSProperties::copy (TAO_NS_QoSProperties& qos_properties)
 }
 
 int
-TAO_NS_QoSProperties::transfer (TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_QoSProperties::transfer (TAO_Notify_QoSProperties& qos_properties)
 {
   if (this->copy (qos_properties) == -1)
     return -1;
@@ -114,28 +114,28 @@ TAO_NS_QoSProperties::transfer (TAO_NS_QoSProperties& qos_properties)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_PropertyBase_T<CORBA::Long>;
-template class TAO_NS_PropertyBase_T<CORBA::Short>;
-template class TAO_NS_PropertyBase_T<TimeBase::TimeT>;
+template class TAO_Notify_PropertyBase_T<CORBA::Long>;
+template class TAO_Notify_PropertyBase_T<CORBA::Short>;
+template class TAO_Notify_PropertyBase_T<TimeBase::TimeT>;
 
-template class TAO_NS_Property_T<CORBA::Long>;
-template class TAO_NS_Property_T<CORBA::Short>;
-template class TAO_NS_Property_T<TimeBase::TimeT>;
+template class TAO_Notify_Property_T<CORBA::Long>;
+template class TAO_Notify_Property_T<CORBA::Short>;
+template class TAO_Notify_Property_T<TimeBase::TimeT>;
 
-template class TAO_NS_StructProperty_T<NotifyExt::ThreadPoolParams>;
-template class TAO_NS_StructProperty_T<NotifyExt::ThreadPoolLanesParams>;
+template class TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams>;
+template class TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_PropertyBase_T<CORBA::Long>
-#pragma instantiate TAO_NS_PropertyBase_T<CORBA::Short>
-#pragma instantiate TAO_NS_PropertyBase_T<TimeBase::TimeT>
+#pragma instantiate TAO_Notify_PropertyBase_T<CORBA::Long>
+#pragma instantiate TAO_Notify_PropertyBase_T<CORBA::Short>
+#pragma instantiate TAO_Notify_PropertyBase_T<TimeBase::TimeT>
 
-#pragma instantiate TAO_NS_Property_T<CORBA::Long>
-#pragma instantiate TAO_NS_Property_T<CORBA::Short>
-#pragma instantiate TAO_NS_Property_T<TimeBase::TimeT>
+#pragma instantiate TAO_Notify_Property_T<CORBA::Long>
+#pragma instantiate TAO_Notify_Property_T<CORBA::Short>
+#pragma instantiate TAO_Notify_Property_T<TimeBase::TimeT>
 
-#pragma instantiate TAO_NS_StructProperty_T<NotifyExt::ThreadPoolParams>
-#pragma instantiate TAO_NS_StructProperty_T<NotifyExt::ThreadPoolLanesParams>
+#pragma instantiate TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams>
+#pragma instantiate TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index 0b65e375865..57342f04194 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_QOSPROPERTIES_H
-#define TAO_NS_QOSPROPERTIES_H
+#ifndef TAO_Notify_QOSPROPERTIES_H
+#define TAO_Notify_QOSPROPERTIES_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,41 +25,41 @@
 #include "Property.h"
 
 /**
- * @class TAO_NS_QoSProperties
+ * @class TAO_Notify_QoSProperties
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_QoSProperties : public TAO_NS_PropertySeq
+class TAO_Notify_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq
 {
 public:
   /// Constuctor
-  TAO_NS_QoSProperties (void);
+  TAO_Notify_QoSProperties (void);
 
   /// Destructor
-  ~TAO_NS_QoSProperties ();
+  ~TAO_Notify_QoSProperties ();
 
   /// Return 0 on success, 1 if unsupported properties were detected and -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq);
 
   /// Populate <qos_properties> with all properties from this object. Returns -1 on error.
-  int copy (TAO_NS_QoSProperties& qos_properties);
+  int copy (TAO_Notify_QoSProperties& qos_properties);
 
   /// Populate <qos_properties> with properties that can be transfered.Returns -1 on error.
-  int transfer (TAO_NS_QoSProperties& qos_properties);
+  int transfer (TAO_Notify_QoSProperties& qos_properties);
 
   ///= Accessors
   /// ThreadPool
-  const TAO_NS_Property_ThreadPool& thread_pool (void) const;
+  const TAO_Notify_Property_ThreadPool& thread_pool (void) const;
 
   /// ThreadPoolLane
-  const TAO_NS_Property_ThreadPoolLanes& thread_pool_lane (void) const;
+  const TAO_Notify_Property_ThreadPoolLanes& thread_pool_lane (void) const;
 
   /// Maximum Batch Size
-  const TAO_NS_Property_Long& maximum_batch_size (void) const;
+  const TAO_Notify_Property_Long& maximum_batch_size (void) const;
 
   /// Pacing Interval
-  const TAO_NS_Property_Time& pacing_interval (void) const;
+  const TAO_Notify_Property_Time& pacing_interval (void) const;
 
 protected:
   /// Return 1 if <value> is unsupported.
@@ -73,25 +73,25 @@ protected:
   ///= Supported properties
 
   /// Priority
-  TAO_NS_Property_Short priority_;
+  TAO_Notify_Property_Short priority_;
 
   /// Timeout
-  TAO_NS_Property_Time timeout_;
+  TAO_Notify_Property_Time timeout_;
 
   /// Stop Time Supported
-  TAO_NS_Property_Boolean stop_time_supported_;
+  TAO_Notify_Property_Boolean stop_time_supported_;
 
   /// Maximum Batch Size
-  TAO_NS_Property_Long maximum_batch_size_;
+  TAO_Notify_Property_Long maximum_batch_size_;
 
   /// Pacing Interval
-  TAO_NS_Property_Time pacing_interval_;
+  TAO_Notify_Property_Time pacing_interval_;
 
   /// ThreadPool Params.
-  TAO_NS_Property_ThreadPool thread_pool_;
+  TAO_Notify_Property_ThreadPool thread_pool_;
 
   /// ThreadPoolLane Params.
-  TAO_NS_Property_ThreadPoolLanes thread_pool_lane_;
+  TAO_Notify_Property_ThreadPoolLanes thread_pool_lane_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -99,4 +99,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_QOSPROPERTIES_H */
+#endif /* TAO_Notify_QOSPROPERTIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
index e331e8b1046..087ab21febe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -1,25 +1,25 @@
 // $Id$
 
-ACE_INLINE const TAO_NS_Property_ThreadPool&
-TAO_NS_QoSProperties::thread_pool (void) const
+ACE_INLINE const TAO_Notify_Property_ThreadPool&
+TAO_Notify_QoSProperties::thread_pool (void) const
 {
   return this->thread_pool_;
 }
 
-ACE_INLINE const TAO_NS_Property_ThreadPoolLanes&
-TAO_NS_QoSProperties::thread_pool_lane (void) const
+ACE_INLINE const TAO_Notify_Property_ThreadPoolLanes&
+TAO_Notify_QoSProperties::thread_pool_lane (void) const
 {
   return this->thread_pool_lane_;
 }
 
-ACE_INLINE const TAO_NS_Property_Long&
-TAO_NS_QoSProperties::maximum_batch_size (void) const
+ACE_INLINE const TAO_Notify_Property_Long&
+TAO_Notify_QoSProperties::maximum_batch_size (void) const
 {
   return this->maximum_batch_size_;
 }
 
-ACE_INLINE const TAO_NS_Property_Time&
-TAO_NS_QoSProperties::pacing_interval (void) const
+ACE_INLINE const TAO_Notify_Property_Time&
+TAO_Notify_QoSProperties::pacing_interval (void) const
 {
   return this->pacing_interval_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 3b564912b81..1e776259e0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -13,31 +13,31 @@
 #include "RT_Builder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_RT_Builder, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_RT_Builder, "$Id$")
 
-TAO_NS_RT_Builder::TAO_NS_RT_Builder (void)
+TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
 {
 }
 
-TAO_NS_RT_Builder::~TAO_NS_RT_Builder ()
+TAO_Notify_RT_Builder::~TAO_Notify_RT_Builder ()
 {
 }
 
 void
-TAO_NS_RT_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object
+TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
                                                        , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
 {
-  TAO_NS_RT_POA_Helper* proxy_poa = 0;
+  TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
   // Bootstrap EC Proxy POA
   ACE_NEW_THROW_EX (proxy_poa,
-                    TAO_NS_RT_POA_Helper (),
+                    TAO_Notify_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  auto_ptr<TAO_NS_POA_Helper> auto_proxy_poa (proxy_poa);
+  auto_ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
 
-  PortableServer::POA_var default_poa = TAO_NS_PROPERTIES::instance ()->default_poa ();
+  PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
   proxy_poa->init (default_poa.in (), tp_params ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -50,20 +50,20 @@ TAO_NS_RT_Builder::apply_thread_pool_concurrency (TAO_NS_Object& object
 }
 
 void
-TAO_NS_RT_Builder::apply_lane_concurrency (TAO_NS_Object& object
+TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
                                                 , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
 {
-  TAO_NS_RT_POA_Helper* proxy_poa = 0;
+  TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
   // Bootstrap EC Proxy POA
   ACE_NEW_THROW_EX (proxy_poa,
-                    TAO_NS_RT_POA_Helper (),
+                    TAO_Notify_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  auto_ptr<TAO_NS_POA_Helper> auto_proxy_poa (proxy_poa);
+  auto_ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
 
-  PortableServer::POA_var default_poa = TAO_NS_PROPERTIES::instance ()->default_poa ();
+  PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
   proxy_poa->init (default_poa.in (), tpl_params ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index ca8beb37ad6..bfeb17357b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_BUILDER_H
-#define TAO_NS_RT_BUILDER_H
+#ifndef TAO_Notify_RT_BUILDER_H
+#define TAO_Notify_RT_BUILDER_H
 #include "ace/pre.h"
 
 #include "rt_notify_export.h"
@@ -22,25 +22,25 @@
 #include "Builder.h"
 
 /**
- * @class TAO_NS_RT_Builder
+ * @class TAO_Notify_RT_Builder
  *
  * @brief Builder for RT specific classes.
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_Builder : public TAO_NS_Builder
+class TAO_RT_Notify_Export TAO_Notify_RT_Builder : public TAO_Notify_Builder
 {
 public:
   /// Constuctor
-  TAO_NS_RT_Builder (void);
+  TAO_Notify_RT_Builder (void);
 
   /// Destructor
-  virtual ~TAO_NS_RT_Builder ();
+  virtual ~TAO_Notify_RT_Builder ();
 
   /// Apply Thread Pools.
-  virtual void apply_thread_pool_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
 
   /// Apply Thread Pools with Lanes.
-  virtual void apply_lane_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
@@ -48,4 +48,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_BUILDER_H */
+#endif /* TAO_Notify_RT_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index 1d7c3eeffbd..b587353f0c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -8,124 +8,124 @@
 
 #include "Structured/RT_StructuredProxyPushSupplier.h"
 
-ACE_RCSID(RT_Notify, TAO_NS_RT_Factory, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$")
 
-TAO_NS_RT_Factory::TAO_NS_RT_Factory (void)
+TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void)
 {
 }
 
-TAO_NS_RT_Factory::~TAO_NS_RT_Factory ()
+TAO_Notify_RT_Factory::~TAO_Notify_RT_Factory ()
 {
 }
 
 void
-TAO_NS_RT_Factory::create (TAO_NS_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (proxy,
-                    TAO_NS_RT_StructuredProxyPushSupplier (),
+                    TAO_Notify_RT_StructuredProxyPushSupplier (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_EventChannel_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_Proxy_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (channel_factory ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel_factory ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (channel ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_Factory:: create (TAO_NS_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
 }
 
-ACE_FACTORY_DEFINE (TAO_RT_Notify, TAO_NS_RT_Factory)
+ACE_FACTORY_DEFINE (TAO_RT_Notify, TAO_Notify_RT_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 852d1b1d71c..635788f5b43 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_FACTORY_H
-#define TAO_NS_RT_FACTORY_H
+#ifndef TAO_Notify_RT_FACTORY_H
+#define TAO_Notify_RT_FACTORY_H
 #include "ace/pre.h"
 
 #include "rt_notify_export.h"
@@ -22,80 +22,80 @@
 #include "Default_Factory.h"
 
 /**
- * @class TAO_NS_RT_Factory
+ * @class TAO_Notify_RT_Factory
  *
  * @brief The Factory for the RT aware Notify classes.
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_Factory : public TAO_NS_Default_Factory
+class TAO_RT_Notify_Export TAO_Notify_RT_Factory : public TAO_Notify_Default_Factory
 {
 public:
   /// Constuctor
-  TAO_NS_RT_Factory (void);
+  TAO_Notify_RT_Factory (void);
 
   /// Destructor
-  virtual ~TAO_NS_RT_Factory ();
+  virtual ~TAO_Notify_RT_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_NS_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_NS_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_NS_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_NS_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_NS_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create Proxy Collection
-  virtual void create (TAO_NS_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_NS_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
 
   /// Create EventChannel
-  virtual void create (TAO_NS_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_NS_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_NS_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_NS_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_NS_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_NS_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_NS_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_NS_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_NS_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_NS_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_NS_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
 };
 
-ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_NS_RT_Factory)
+ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory)
 
 #if defined (__ACE_INLINE__)
 #include "RT_Factory.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_FACTORY_H */
+#endif /* TAO_Notify_RT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index cf3b8394b62..b62aa0fc326 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -6,7 +6,7 @@
 #include "RT_Notify_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_RT_Notify_Service, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
 
 #include "ace/Dynamic_Service.h"
 #include "Properties.h"
@@ -44,7 +44,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   TAO_CosNotify_Service::init_i (orb ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_NS_RT_Properties* properties = TAO_NS_RT_PROPERTIES::instance();
+  TAO_Notify_RT_Properties* properties = TAO_Notify_RT_PROPERTIES::instance();
 
   // Resolve RTORB
   CORBA::Object_var object =
@@ -76,28 +76,28 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 void
 TAO_RT_Notify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->factory_ = ACE_Dynamic_Service<TAO_NS_Factory>::instance ("TAO_NS_Factory");
+  this->factory_ = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
 
   if (this->factory_ == 0)
     {
       ACE_NEW_THROW_EX (this->factory_,
-                        TAO_NS_RT_Factory (),
+                        TAO_Notify_RT_Factory (),
                         CORBA::NO_MEMORY ());
       ACE_CHECK;
     }
 
-  TAO_NS_PROPERTIES::instance()->factory (this->factory_);
+  TAO_Notify_PROPERTIES::instance()->factory (this->factory_);
 }
 
 void
 TAO_RT_Notify_Service::init_builder (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->builder_,
-                    TAO_NS_RT_Builder (),
+                    TAO_Notify_RT_Builder (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  TAO_NS_PROPERTIES::instance()->builder (this->builder_);
+  TAO_Notify_PROPERTIES::instance()->builder (this->builder_);
 }
 
 ACE_FACTORY_DEFINE (TAO_RT_Notify,TAO_RT_Notify_Service)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index ec2b9f59c67..79a890fc07e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_NOTIFY_SERVICE_H
-#define TAO_NS_RT_NOTIFY_SERVICE_H
+#ifndef TAO_Notify_RT_NOTIFY_SERVICE_H
+#define TAO_Notify_RT_NOTIFY_SERVICE_H
 
 #include "ace/pre.h"
 #include "rt_notify_export.h"
@@ -24,7 +24,7 @@
 /**
  * @class TAO_RT_Notify_Service
  *
- * @brief Implemetation of the TAO_NS_Service interface for RT Notification.
+ * @brief Implemetation of the TAO_Notify_Service interface for RT Notification.
  *
  */
 class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service
@@ -60,4 +60,4 @@ ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service)
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_NOTIFY_SERVICE_H */
+#endif /* TAO_Notify_RT_NOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index b0bb7c96506..77dd21f079a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -10,14 +10,14 @@
 #include "RT_POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_RT_POA_Helper, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_RT_POA_Helper, "$Id$")
 
-TAO_NS_RT_POA_Helper::~TAO_NS_RT_POA_Helper ()
+TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
 {
 }
 
 void
-TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
@@ -25,7 +25,7 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt:
 }
 
 void
-TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
                                  , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList policy_list (4);
@@ -33,7 +33,7 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
   this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  RTCORBA::RTORB_var rt_orb = TAO_NS_RT_PROPERTIES::instance ()->rt_orb ();
+  RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
   RTCORBA::PriorityModel priority_model =
     tp_params.priority_model == NotifyExt::CLIENT_PROPAGATED ?
@@ -76,7 +76,7 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
 }
 
 void
-TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
@@ -84,7 +84,7 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt:
 }
 
 void
-TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
                                  , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList policy_list (4);
@@ -92,7 +92,7 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
   this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  RTCORBA::RTORB_var rt_orb = TAO_NS_RT_PROPERTIES::instance ()->rt_orb ();
+  RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
   RTCORBA::PriorityModel priority_model =
     tpl_params.priority_model == NotifyExt::CLIENT_PROPAGATED ?
@@ -143,11 +143,11 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
 }
 
 void
-TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList policy_list (1);
 
-  RTCORBA::RTORB_var rt_orb = TAO_NS_RT_PROPERTIES::instance ()->rt_orb ();
+  RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
   policy_list.length (1);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 63150165467..f24f026ccdf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_POA_Helper_H
-#define TAO_NS_RT_POA_Helper_H
+#ifndef TAO_Notify_RT_POA_Helper_H
+#define TAO_Notify_RT_POA_Helper_H
 #include "ace/pre.h"
 
 #include "rt_notify_export.h"
@@ -23,16 +23,16 @@
 #include "orbsvcs/NotifyExtC.h"
 
 /**
- * @class TAO_NS_RT_POA_Helper
+ * @class TAO_Notify_RT_POA_Helper
  *
  * @brief Helper for creating RT POA objects.
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_POA_Helper : public TAO_NS_POA_Helper
+class TAO_RT_Notify_Export TAO_Notify_RT_POA_Helper : public TAO_Notify_POA_Helper
 {
 public:
   /// Destructor
-  ~TAO_NS_RT_POA_Helper ();
+  ~TAO_Notify_RT_POA_Helper ();
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
@@ -61,4 +61,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_POA_Helper_H */
+#endif /* TAO_Notify_RT_POA_Helper_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index bb82f40736a..9ccd90bcdce 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -6,22 +6,22 @@
 #include "RT_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_RT_Properties, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$")
 
-TAO_NS_RT_Properties::TAO_NS_RT_Properties (void)
+TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void)
 {
 }
 
-TAO_NS_RT_Properties::~TAO_NS_RT_Properties ()
+TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties ()
 {
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Singleton<TAO_NS_RT_Properties, TAO_SYNCH_MUTEX>;
+template class TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Singleton<TAO_NS_RT_Properties, TAO_SYNCH_MUTEX>
+#pragma instantiate TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
index 415d0dbd79c..4692f350225 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_PROPERTIES_H
-#define TAO_NS_RT_PROPERTIES_H
+#ifndef TAO_Notify_RT_PROPERTIES_H
+#define TAO_Notify_RT_PROPERTIES_H
 #include "ace/pre.h"
 
 #include "rt_notify_export.h"
@@ -23,21 +23,21 @@
 #include "tao/RTCORBA/RTCORBA.h"
 
 /**
- * @class TAO_NS_RT_Properties
+ * @class TAO_Notify_RT_Properties
  *
  * @brief RT specifc global properties are stored here.
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_Properties
+class TAO_RT_Notify_Export TAO_Notify_RT_Properties
 {
-  friend class TAO_Singleton<TAO_NS_RT_Properties, TAO_SYNCH_MUTEX>;
+  friend class TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX>;
 
 public:
   /// Constuctor
-  TAO_NS_RT_Properties (void);
+  TAO_Notify_RT_Properties (void);
 
   /// Destructor
-  ~TAO_NS_RT_Properties ();
+  ~TAO_Notify_RT_Properties ();
 
   RTCORBA::RTORB_ptr rt_orb (void);
   void rt_orb (RTCORBA::RTORB_ptr rt_orb);
@@ -53,13 +53,13 @@ protected:
   RTCORBA::Current_var current_;
 };
 
-typedef TAO_Singleton<TAO_NS_RT_Properties, TAO_SYNCH_MUTEX> TAO_NS_RT_PROPERTIES;
+typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES;
 
-TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_NS_RT_Properties, TAO_SYNCH_MUTEX);
+TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX);
 
 #if defined (__ACE_INLINE__)
 #include "RT_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_PROPERTIES_H */
+#endif /* TAO_Notify_RT_PROPERTIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
index 77ba96126a0..9eafa07973a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -3,25 +3,25 @@
 #include "RT_Properties.h"
 
 ACE_INLINE RTCORBA::RTORB_ptr
-TAO_NS_RT_Properties::rt_orb (void)
+TAO_Notify_RT_Properties::rt_orb (void)
 {
   return RTCORBA::RTORB::_duplicate (rt_orb_.in ());
 }
 
 ACE_INLINE void
-TAO_NS_RT_Properties::rt_orb (RTCORBA::RTORB_ptr rt_orb)
+TAO_Notify_RT_Properties::rt_orb (RTCORBA::RTORB_ptr rt_orb)
 {
   rt_orb_ = RTCORBA::RTORB::_duplicate (rt_orb);
 }
 
 ACE_INLINE RTCORBA::Current_ptr
-TAO_NS_RT_Properties::current (void)
+TAO_Notify_RT_Properties::current (void)
 {
   return RTCORBA::Current::_duplicate (current_.in());
 }
 
 ACE_INLINE void
-TAO_NS_RT_Properties::current (RTCORBA::Current_ptr current)
+TAO_Notify_RT_Properties::current (RTCORBA::Current_ptr current)
 {
   current_ = RTCORBA::Current::_duplicate (current);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index a655b8745da..6f51070662e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -6,47 +6,47 @@
 #include "Reactive_Task.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Reactive_Task, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$")
 
 #include "Timer_Reactor.h"
 
-TAO_NS_Reactive_Task::TAO_NS_Reactive_Task (void)
+TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void)
   :timer_ (0)
 {
 }
 
-TAO_NS_Reactive_Task::~TAO_NS_Reactive_Task ()
+TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task ()
 {
 }
 
 void
-TAO_NS_Reactive_Task::init (TAO_NS_AdminProperties_var& /*admin_properties*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Reactive_Task::init (TAO_Notify_AdminProperties_var& /*admin_properties*/ ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->timer_,
-                    TAO_NS_Timer_Reactor (),
+                    TAO_Notify_Timer_Reactor (),
                     CORBA::NO_MEMORY ());
 }
 
 void
-TAO_NS_Reactive_Task::release (void)
+TAO_Notify_Reactive_Task::release (void)
 {
   this->timer_->_decr_refcnt ();
   delete this; //TODO: Release via factory.
 }
 
 void
-TAO_NS_Reactive_Task::shutdown (void)
+TAO_Notify_Reactive_Task::shutdown (void)
 {
 }
 
 void
-TAO_NS_Reactive_Task::execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
 {
   method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_NS_Timer*
-TAO_NS_Reactive_Task::timer (void)
+TAO_Notify_Timer*
+TAO_Notify_Reactive_Task::timer (void)
 {
   this->timer_->_incr_refcnt ();
   return this->timer_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index adb64d1f78a..f5d9da3a41e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_REACTIVE_TASK_H
-#define TAO_NS_REACTIVE_TASK_H
+#ifndef TAO_Notify_REACTIVE_TASK_H
+#define TAO_Notify_REACTIVE_TASK_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,44 +22,44 @@
 #include "Worker_Task.h"
 #include "AdminProperties.h"
 
-class TAO_NS_Timer_Reactor;
+class TAO_Notify_Timer_Reactor;
 
 /**
- * @class TAO_NS_Reactive_Task
+ * @class TAO_Notify_Reactive_Task
  *
  * @brief A reactive worker task. Simply executes the command in the caller's context.
  *
  */
-class TAO_Notify_Export TAO_NS_Reactive_Task : public TAO_NS_Worker_Task
+class TAO_Notify_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task
 {
 public:
   /// Constuctor
-  TAO_NS_Reactive_Task (void);
+  TAO_Notify_Reactive_Task (void);
 
   /// Destructor
-  ~TAO_NS_Reactive_Task ();
+  ~TAO_Notify_Reactive_Task ();
 
   /// Release
   virtual void release (void);
 
   /// Init the reactive task.
-  void init (TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Shutdown task
   virtual void shutdown (void);
 
   /// Exec the request.
-  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
-  virtual TAO_NS_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer (void);
 
   /// Returns NULL.
-  virtual TAO_NS_Buffering_Strategy* buffering_strategy (void);
+  virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void);
 
 protected:
   /// The timer.
-  TAO_NS_Timer_Reactor* timer_;
+  TAO_Notify_Timer_Reactor* timer_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -67,4 +67,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_REACTIVE_TASK_H */
+#endif /* TAO_Notify_REACTIVE_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
index 348e107c4ad..239c919549b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
@@ -1,7 +1,7 @@
 // $Id$
 
-ACE_INLINE TAO_NS_Buffering_Strategy*
-TAO_NS_Reactive_Task::buffering_strategy (void)
+ACE_INLINE TAO_Notify_Buffering_Strategy*
+TAO_Notify_Reactive_Task::buffering_strategy (void)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index ee2d7a24513..6e432eec14e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -8,19 +8,19 @@
 #include "Refcountable.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Refcountable, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$")
 
-TAO_NS_Refcountable::TAO_NS_Refcountable (void)
+TAO_Notify_Refcountable::TAO_Notify_Refcountable (void)
   :refcount_ (1)
 {
 }
 
-TAO_NS_Refcountable::~TAO_NS_Refcountable ()
+TAO_Notify_Refcountable::~TAO_Notify_Refcountable ()
 {
 }
 
 CORBA::ULong
-TAO_NS_Refcountable::_incr_refcnt (void)
+TAO_Notify_Refcountable::_incr_refcnt (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
 
@@ -32,7 +32,7 @@ TAO_NS_Refcountable::_incr_refcnt (void)
 }
 
 CORBA::ULong
-TAO_NS_Refcountable::_decr_refcnt (void)
+TAO_Notify_Refcountable::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index d01a49b347f..8088bdec143 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_REFCOUNTABLE_H
-#define TAO_NS_REFCOUNTABLE_H
+#ifndef TAO_Notify_REFCOUNTABLE_H
+#define TAO_Notify_REFCOUNTABLE_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,19 +24,19 @@
 #include "tao/corbafwd.h"
 
 /**
- * @class TAO_NS_Refcountable
+ * @class TAO_Notify_Refcountable
  *
  * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0.
  *
  */
-class TAO_Notify_Export TAO_NS_Refcountable
+class TAO_Notify_Export TAO_Notify_Refcountable
 {
 public:
   /// Constuctor
-  TAO_NS_Refcountable (void);
+  TAO_Notify_Refcountable (void);
 
   /// Destructor
-  virtual ~TAO_NS_Refcountable ();
+  virtual ~TAO_Notify_Refcountable ();
 
   /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy
   CORBA::ULong _incr_refcnt (void);
@@ -58,4 +58,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_REFCOUNTABLE_H */
+#endif /* TAO_Notify_REFCOUNTABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
index 9af293e7bfa..95245d1fae7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_REFCOUNTABLE_GUARD_T_CPP
-#define TAO_NS_REFCOUNTABLE_GUARD_T_CPP
+#ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
+#define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
 
 #include "Refcountable_Guard_T.h"
 
@@ -9,6 +9,6 @@
 #include "Refcountable_Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Refcountable_Guard_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Refcountable_Guard_T, "$id$")
 
-#endif /* TAO_NS_REFCOUNTABLE_GUARD_T_CPP */
+#endif /* TAO_Notify_REFCOUNTABLE_GUARD_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
index 22af0962291..b8c38c24bcc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_REFCOUNTABLE_GUARD_T_H
-#define TAO_NS_REFCOUNTABLE_GUARD_T_H
+#ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_H
+#define TAO_Notify_REFCOUNTABLE_GUARD_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -20,20 +20,20 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
- * @class TAO_NS_Refcountable_Guard_T
+ * @class TAO_Notify_Refcountable_Guard_T
  *
  * @brief Increments the reference count in the constructor, the count is decremented in the destructor.
  *
  */
 template <class T>
-class TAO_NS_Refcountable_Guard_T
+class TAO_Notify_Refcountable_Guard_T
 {
 public:
   /// Constuctor
-  TAO_NS_Refcountable_Guard_T (T* t);
+  TAO_Notify_Refcountable_Guard_T (T* t);
 
   /// Destructor
-  ~TAO_NS_Refcountable_Guard_T ();
+  ~TAO_Notify_Refcountable_Guard_T ();
 
   /// Redirection operator
   T *operator-> (void) const;
@@ -57,4 +57,4 @@ private:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_REFCOUNTABLE_GUARD_T_H */
+#endif /* TAO_Notify_REFCOUNTABLE_GUARD_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
index 2e11b1ff701..5e16e7d04f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -1,26 +1,26 @@
 // $Id$
 
 template <class T> ACE_INLINE
-TAO_NS_Refcountable_Guard_T<T>::TAO_NS_Refcountable_Guard_T (T *t)
+TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (T *t)
   : t_ (t)
 {
   this->t_->_incr_refcnt ();
 }
 
 template <class T> ACE_INLINE
-TAO_NS_Refcountable_Guard_T<T>::~TAO_NS_Refcountable_Guard_T ()
+TAO_Notify_Refcountable_Guard_T<T>::~TAO_Notify_Refcountable_Guard_T ()
 {
   this->t_->_decr_refcnt ();
 }
 
 template <class T> ACE_INLINE T*
-TAO_NS_Refcountable_Guard_T<T>::operator-> (void) const
+TAO_Notify_Refcountable_Guard_T<T>::operator-> (void) const
 {
   return this->t_;
 }
 
 template <class T> ACE_INLINE T&
-TAO_NS_Refcountable_Guard_T<T>::operator *(void) const
+TAO_Notify_Refcountable_Guard_T<T>::operator *(void) const
 {
   return *this->t_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index ff6dade8f40..98ef75a6bb6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_SEQ_WORKER_T_CPP
-#define TAO_NS_SEQ_WORKER_T_CPP
+#ifndef TAO_Notify_SEQ_WORKER_T_CPP
+#define TAO_Notify_SEQ_WORKER_T_CPP
 
 #include "Seq_Worker_T.h"
 
@@ -9,15 +9,15 @@
 #include "Seq_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Seq_Worker_T, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Seq_Worker_T, "$Id$")
 
 template <class T>
-TAO_NS_Seq_Worker_T<T>::TAO_NS_Seq_Worker_T (void)
+TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
 {
 }
 
-template<class TYPE> ACE_TYPENAME TAO_NS_Seq_Worker_T<TYPE>::SEQ*
-TAO_NS_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
+template<class TYPE> ACE_TYPENAME TAO_Notify_Seq_Worker_T<TYPE>::SEQ*
+TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
 {
   SEQ* tmp;
   ACE_NEW_THROW_EX (tmp, //this->seq_,
@@ -33,4 +33,4 @@ TAO_NS_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
 
 }
 
-#endif /* TAO_NS_SEQ_WORKER_T_CPP */
+#endif /* TAO_Notify_SEQ_WORKER_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index c4cb69c2f6d..4f1935218d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQ_WORKER_T_H
-#define TAO_NS_SEQ_WORKER_T_H
+#ifndef TAO_Notify_SEQ_WORKER_T_H
+#define TAO_Notify_SEQ_WORKER_T_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,22 +24,22 @@
 #include "Container_T.h"
 
 /**
- * @class TAO_NS_Seq_Worker_T
+ * @class TAO_Notify_Seq_Worker_T
  *
  * @brief Helper to construct a sequence of IDS in a collections.
  *
  */
 template <class TYPE>
-class TAO_Notify_Export TAO_NS_Seq_Worker_T : public TAO_ESF_Worker<TYPE>
+class TAO_Notify_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE>
 {
-  typedef TAO_NS_Container_T<TYPE> CONTAINER;
+  typedef TAO_Notify_Container_T<TYPE> CONTAINER;
   typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION;
   typedef typename TYPE::SEQ SEQ;
   typedef typename TYPE::SEQ_VAR SEQ_VAR;
 
 public:
   /// Constructor
-  TAO_NS_Seq_Worker_T (void);
+  TAO_Notify_Seq_Worker_T (void);
 
   /// create a SEQ
   SEQ* create (CONTAINER& container ACE_ENV_ARG_DECL);
@@ -65,4 +65,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQ_WORKER_T_H */
+#endif /* TAO_Notify_SEQ_WORKER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
index 97489c1811e..08a858c55db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 template<class TYPE> ACE_INLINE void
-TAO_NS_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->seq_->length (this->seq_->length () + 1);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
index fd9aef09f34..6093b26b009 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
@@ -7,19 +7,19 @@
 #include "Batch_Buffering_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Batch_Buffering_Strategy, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Batch_Buffering_Strategy, "$id$")
 
-TAO_NS_Batch_Buffering_Strategy::TAO_NS_Batch_Buffering_Strategy (TAO_NS_Message_Queue& msg_queue, TAO_NS_AdminProperties_var& admin_properties, CORBA::Long batch_size)
-  :TAO_NS_Buffering_Strategy (msg_queue, admin_properties, batch_size)
+TAO_Notify_Batch_Buffering_Strategy::TAO_Notify_Batch_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size)
+  :TAO_Notify_Buffering_Strategy (msg_queue, admin_properties, batch_size)
 {
 }
 
-TAO_NS_Batch_Buffering_Strategy::~TAO_NS_Batch_Buffering_Strategy ()
+TAO_Notify_Batch_Buffering_Strategy::~TAO_Notify_Batch_Buffering_Strategy ()
 {
 }
 
 int
-TAO_NS_Batch_Buffering_Strategy::dequeue_batch (CosNotification::EventBatch& event_batch)
+TAO_Notify_Batch_Buffering_Strategy::dequeue_batch (CosNotification::EventBatch& event_batch)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
@@ -47,7 +47,7 @@ TAO_NS_Batch_Buffering_Strategy::dequeue_batch (CosNotification::EventBatch& eve
 }
 
 int
-TAO_NS_Batch_Buffering_Strategy::dequeue_available (CosNotification::EventBatch& event_batch, int &pending)
+TAO_Notify_Batch_Buffering_Strategy::dequeue_available (CosNotification::EventBatch& event_batch, int &pending)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
@@ -62,7 +62,7 @@ TAO_NS_Batch_Buffering_Strategy::dequeue_available (CosNotification::EventBatch&
 }
 
 int
-TAO_NS_Batch_Buffering_Strategy::dequeue_i (int max_deq_count, CosNotification::EventBatch& event_batch)
+TAO_Notify_Batch_Buffering_Strategy::dequeue_i (int max_deq_count, CosNotification::EventBatch& event_batch)
 {
   ACE_Message_Block *mb;
 
@@ -77,7 +77,7 @@ TAO_NS_Batch_Buffering_Strategy::dequeue_i (int max_deq_count, CosNotification::
 
       --this->global_queue_length_;
 
-      TAO_NS_Method_Request_Event* mre = ACE_dynamic_cast (TAO_NS_Method_Request_Event*, mb);
+      TAO_Notify_Method_Request_Event* mre = ACE_dynamic_cast (TAO_Notify_Method_Request_Event*, mb);
 
       mre->event ()->convert (event_batch[deq_count]);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
index 196f4a67242..6e55d359fb7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_BATCH_BUFFERING_STRATEGY_H
-#define TAO_NS_BATCH_BUFFERING_STRATEGY_H
+#ifndef TAO_Notify_BATCH_BUFFERING_STRATEGY_H
+#define TAO_Notify_BATCH_BUFFERING_STRATEGY_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -23,19 +23,19 @@
 #include "../Buffering_Strategy.h"
 
 /**
- * @class TAO_NS_Batch_Buffering_Strategy
+ * @class TAO_Notify_Batch_Buffering_Strategy
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_Batch_Buffering_Strategy : public TAO_NS_Buffering_Strategy
+class TAO_Notify_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy
 {
 public:
   /// Constuctor
-  TAO_NS_Batch_Buffering_Strategy (TAO_NS_Message_Queue& msg_queue, TAO_NS_AdminProperties_var& admin_properties, CORBA::Long batch_size);
+  TAO_Notify_Batch_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size);
 
   /// Destructor
-  ~TAO_NS_Batch_Buffering_Strategy ();
+  ~TAO_Notify_Batch_Buffering_Strategy ();
 
   /// Dequeue batch. This method will block till <batch_size> is available..
   /// Return -1 on error else the number of items actually dequeued.
@@ -57,4 +57,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_BATCH_BUFFERING_STRATEGY_H */
+#endif /* TAO_Notify_BATCH_BUFFERING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 4b95bd7ee25..c89e6276efb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "SequenceProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_SequenceProxyPushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_SequenceProxyPushConsumer, "$id$")
 
 #include "tao/debug.h"
 #include "SequencePushSupplier.h"
@@ -15,17 +15,17 @@ ACE_RCSID(Notify, TAO_NS_SequenceProxyPushConsumer, "$id$")
 #include "../Worker_Task.h"
 #include "../Structured/StructuredEvent.h"
 
-TAO_NS_SequenceProxyPushConsumer::TAO_NS_SequenceProxyPushConsumer (void)
+TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void)
 :pacing_interval_ (CosNotification::PacingInterval)
 {
 }
 
-TAO_NS_SequenceProxyPushConsumer::~TAO_NS_SequenceProxyPushConsumer ()
+TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer ()
 {
 }
 
 void
-TAO_NS_SequenceProxyPushConsumer::release (void)
+TAO_Notify_SequenceProxyPushConsumer::release (void)
 {
   if (this->supplier_)
     this->supplier_->release ();
@@ -35,10 +35,10 @@ TAO_NS_SequenceProxyPushConsumer::release (void)
 }
 
 void
-TAO_NS_SequenceProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_SequenceProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_SequenceProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -47,7 +47,7 @@ TAO_NS_SequenceProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -56,16 +56,16 @@ TAO_NS_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
   // Convert Supplier to Base Type
-  TAO_NS_SequencePushSupplier *supplier;
+  TAO_Notify_SequencePushSupplier *supplier;
   ACE_NEW_THROW_EX (supplier,
-                    TAO_NS_SequencePushSupplier (this),
+                    TAO_Notify_SequencePushSupplier (this),
                     CORBA::NO_MEMORY ());
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
@@ -75,7 +75,7 @@ TAO_NS_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm:
 }
 
 void
-TAO_NS_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -94,16 +94,16 @@ TAO_NS_SequenceProxyPushConsumer::push_structured_events (const CosNotification:
     {
       const CosNotification::StructuredEvent& notification = event_batch[i];
 
-      TAO_NS_StructuredEvent_No_Copy event (notification);
+      TAO_Notify_StructuredEvent_No_Copy event (notification);
 
-      TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+      TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
       this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
     }
 }
 
 void
-TAO_NS_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 068d39067ac..b1c2ea08df1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPROXYPUSHCONSUMER_H
-#define TAO_NS_SEQUENCEPROXYPUSHCONSUMER_H
+#ifndef TAO_Notify_SEQUENCEPROXYPUSHCONSUMER_H
+#define TAO_Notify_SEQUENCEPROXYPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -30,22 +30,22 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_SequenceProxyPushConsumer
+ * @class TAO_Notify_SequenceProxyPushConsumer
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_SequenceProxyPushConsumer : public virtual TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
+class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_SequenceProxyPushConsumer (void);
+  TAO_Notify_SequenceProxyPushConsumer (void);
 
   /// Destructor
-  ~TAO_NS_SequenceProxyPushConsumer ();
+  ~TAO_Notify_SequenceProxyPushConsumer ();
 
-  /// TAO_NS_Destroy_Callback methods
+  /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
   /// Destroy this object.
@@ -53,7 +53,7 @@ public:
 
 protected:
   ///= Data Members
-  TAO_NS_Property_Time pacing_interval_;
+  TAO_Notify_Property_Time pacing_interval_;
 
   ///= Protected Methods
 
@@ -94,4 +94,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPROXYPUSHCONSUMER_H */
+#endif /* TAO_Notify_SEQUENCEPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 8660198e8f2..0d995ad5d79 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -6,24 +6,24 @@
 #include "SequenceProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_SequenceProxyPushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_SequenceProxyPushSupplier, "$id$")
 
 #include "tao/debug.h"
 #include "SequencePushConsumer.h"
 
-TAO_NS_SequenceProxyPushSupplier::TAO_NS_SequenceProxyPushSupplier (void)
+TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
 {
 }
 
-TAO_NS_SequenceProxyPushSupplier::~TAO_NS_SequenceProxyPushSupplier ()
+TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier ()
 {
 }
 
 void
-TAO_NS_SequenceProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_SequenceProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_SequenceProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -32,7 +32,7 @@ TAO_NS_SequenceProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SequenceProxyPushSupplier::release (void)
+TAO_Notify_SequenceProxyPushSupplier::release (void)
 {
   if (this->consumer_)
     this->consumer_->release ();
@@ -42,7 +42,7 @@ TAO_NS_SequenceProxyPushSupplier::release (void)
 }
 
 void
-TAO_NS_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -50,9 +50,9 @@ TAO_NS_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm:
                    ))
 {
   // Convert Consumer to Base Type
-  TAO_NS_SequencePushConsumer* consumer;
+  TAO_Notify_SequencePushConsumer* consumer;
   ACE_NEW_THROW_EX (consumer,
-                    TAO_NS_SequencePushConsumer (this),
+                    TAO_Notify_SequencePushConsumer (this),
                     CORBA::NO_MEMORY ());
 
   consumer->init (push_consumer, this->admin_properties_ ACE_ENV_ARG_PARAMETER);
@@ -62,7 +62,7 @@ TAO_NS_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm:
 }
 
 void
-TAO_NS_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -72,7 +72,7 @@ TAO_NS_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SIN
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_SequenceProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 49ee0d951c8..09063371ad3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPROXYPUSHSUPPLIER_H
-#define TAO_NS_SEQUENCEPROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_SEQUENCEPROXYPUSHSUPPLIER_H
+#define TAO_Notify_SEQUENCEPROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -31,31 +31,31 @@
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
+TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 /**
- * @class TAO_NS_SequenceProxyPushSupplier
+ * @class TAO_Notify_SequenceProxyPushSupplier
  *
  * @brief Implements the CosNotifyChannelAdmin::SequenceProxyPushSupplier methods.
  *
  *
  */
-class TAO_Notify_Export TAO_NS_SequenceProxyPushSupplier : public virtual TAO_NS_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
+class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_SequenceProxyPushSupplier (void);
+  TAO_Notify_SequenceProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_SequenceProxyPushSupplier ();
+  ~TAO_Notify_SequenceProxyPushSupplier ();
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods
+  /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
   /// = Servant methods
@@ -91,4 +91,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_SEQUENCEPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 73249688e24..8db7ee044fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "SequencePushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_SequencePushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_SequencePushConsumer, "$id$")
 
 #include "ace/Reactor.h"
 #include "tao/debug.h"
@@ -18,26 +18,26 @@ ACE_RCSID(Notify, TAO_NS_SequencePushConsumer, "$id$")
 #include "../Timer.h"
 #include "../Proxy.h"
 
-TAO_NS_SequencePushConsumer::TAO_NS_SequencePushConsumer (TAO_NS_ProxySupplier* proxy)
-  : TAO_NS_Consumer (proxy), pacing_interval_ (ACE_Time_Value::zero), timer_id_ (-1), buffering_strategy_ (0),
+TAO_Notify_SequencePushConsumer::TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy)
+  : TAO_Notify_Consumer (proxy), pacing_interval_ (ACE_Time_Value::zero), timer_id_ (-1), buffering_strategy_ (0),
     max_batch_size_ (CosNotification::MaximumBatchSize, 0), timer_ (0)
 {
 }
 
-TAO_NS_SequencePushConsumer::~TAO_NS_SequencePushConsumer ()
+TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 {
   delete this->buffering_strategy_;
 }
 
 void
-TAO_NS_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL)
 {
   this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
 
   this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
 
   ACE_NEW_THROW_EX (this->buffering_strategy_,
-                    TAO_NS_Batch_Buffering_Strategy (this->msg_queue_, admin_properties,
+                    TAO_Notify_Batch_Buffering_Strategy (this->msg_queue_, admin_properties,
                                                      this->max_batch_size_.value ()),
                     CORBA::NO_MEMORY ());
 
@@ -45,21 +45,21 @@ TAO_NS_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_
 }
 
 void
-TAO_NS_SequencePushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->cancel_timer ();
   this->timer_->_decr_refcnt ();
 }
 
 void
-TAO_NS_SequencePushConsumer::release (void)
+TAO_Notify_SequencePushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_SequencePushConsumer::qos_changed (const TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_SequencePushConsumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 {
   this->max_batch_size_ = qos_properties.maximum_batch_size ().value ();
 
@@ -68,7 +68,7 @@ TAO_NS_SequencePushConsumer::qos_changed (const TAO_NS_QoSProperties& qos_proper
       this->buffering_strategy_->batch_size (this->max_batch_size_.value ());
     }
 
-  const TAO_NS_Property_Time &pacing_interval = qos_properties.pacing_interval ();
+  const TAO_Notify_Property_Time &pacing_interval = qos_properties.pacing_interval ();
 
   if (pacing_interval.is_valid ())
     {
@@ -85,7 +85,7 @@ TAO_NS_SequencePushConsumer::qos_changed (const TAO_NS_QoSProperties& qos_proper
 }
 
 void
-TAO_NS_SequencePushConsumer::schedule_timer (void)
+TAO_Notify_SequencePushConsumer::schedule_timer (void)
 {
   // Schedule the timer.
   if (this->pacing_interval_ != ACE_Time_Value::zero)
@@ -98,29 +98,29 @@ TAO_NS_SequencePushConsumer::schedule_timer (void)
 }
 
 void
-TAO_NS_SequencePushConsumer::cancel_timer (void)
+TAO_Notify_SequencePushConsumer::cancel_timer (void)
 {
   timer_->cancel_timer (this->timer_id_);
 }
 
 void
-TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Event* copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Event* copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_NS_Event_Copy_var copy_var (copy);
+  TAO_Notify_Event_Copy_var copy_var (copy);
 
   this->push_i (copy_var ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Event* method_request;
+  TAO_Notify_Method_Request_Event* method_request;
 
   ACE_NEW_THROW_EX (method_request,
-                    TAO_NS_Method_Request_Event (event),
+                    TAO_Notify_Method_Request_Event (event),
                     CORBA::NO_MEMORY ());
 
   int msg_count = this->buffering_strategy_->enqueue (*method_request);
@@ -143,19 +143,19 @@ TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_D
 }
 
 void
-TAO_NS_SequencePushConsumer::push (const CORBA::Any& /*event*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/ ACE_ENV_ARG_DECL_NOT_USED)
 {
   //NOP
 }
 
 void
-TAO_NS_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/ ACE_ENV_ARG_DECL_NOT_USED)
 {
   //NOP
 }
 
 int
-TAO_NS_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_time*/,
+TAO_Notify_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_time*/,
                                              const void* /*act*/)
 {
   CosNotification::EventBatch event_batch;
@@ -166,7 +166,7 @@ TAO_NS_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_tim
 
   if (deq_count > 0)
     {
-      TAO_NS_Proxy_Guard ref_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
+      TAO_Notify_Proxy_Guard ref_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
 
       this->push (event_batch);
 
@@ -178,7 +178,7 @@ TAO_NS_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_tim
 }
 
 void
-TAO_NS_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 3a825d974a1..94a42da9aa6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPUSHCONSUMER_H
-#define TAO_NS_SEQUENCEPUSHCONSUMER_H
+#ifndef TAO_Notify_SEQUENCEPUSHCONSUMER_H
+#define TAO_Notify_SEQUENCEPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -27,38 +27,38 @@
 #include "../AdminProperties.h"
 #include "Batch_Buffering_Strategy.h"
 
-class TAO_NS_ProxySupplier;
-class TAO_NS_QoSProperties;
-class TAO_NS_Timer;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_QoSProperties;
+class TAO_Notify_Timer;
 
 /**
- * @class TAO_NS_SequencePushConsumer
+ * @class TAO_Notify_SequencePushConsumer
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_SequencePushConsumer : public ACE_Event_Handler, public TAO_NS_Consumer
+class TAO_Notify_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_SequencePushConsumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Destructor
-  ~TAO_NS_SequencePushConsumer ();
+  ~TAO_Notify_SequencePushConsumer ();
 
   /// Init the Consumer
-  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Shutdown the consumer
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods.
+  /// TAO_Notify_Destroy_Callback methods.
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -70,7 +70,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event);
 
   /// Override, Peer::qos_changed
-  virtual void qos_changed (const TAO_NS_QoSProperties& qos_properties);
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
 protected:
   /// When the pacing interval is used, handle_timeout () is called by
@@ -96,16 +96,16 @@ protected:
   CosNotifyComm::SequencePushConsumer_var push_consumer_;
 
   /// The Message queue.
-  TAO_NS_Message_Queue msg_queue_;
+  TAO_Notify_Message_Queue msg_queue_;
 
   /// The Buffering Strategy
-  TAO_NS_Batch_Buffering_Strategy* buffering_strategy_;
+  TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_;
 
   /// Max. batch size.
-  TAO_NS_Property_Long max_batch_size_;
+  TAO_Notify_Property_Long max_batch_size_;
 
   /// The Timer Manager that we use.
-  TAO_NS_Timer* timer_;
+  TAO_Notify_Timer* timer_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -113,4 +113,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPUSHCONSUMER_H */
+#endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index 94447663e55..6034826af21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -6,19 +6,19 @@
 #include "SequencePushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_SequencePushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_SequencePushSupplier, "$id$")
 
-TAO_NS_SequencePushSupplier::TAO_NS_SequencePushSupplier (TAO_NS_ProxyConsumer* proxy)
-  :TAO_NS_Supplier (proxy)
+TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy)
+  :TAO_Notify_Supplier (proxy)
 {
 }
 
-TAO_NS_SequencePushSupplier::~TAO_NS_SequencePushSupplier ()
+TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 {
 }
 
 void
-TAO_NS_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier);
 
@@ -26,7 +26,7 @@ TAO_NS_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_
 }
 
 void
-TAO_NS_SequencePushSupplier::release (void)
+TAO_Notify_SequencePushSupplier::release (void)
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index e981c1b9fae..b9e9c6d67b9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPUSHSUPPLIER_H
-#define TAO_NS_SEQUENCEPUSHSUPPLIER_H
+#ifndef TAO_Notify_SEQUENCEPUSHSUPPLIER_H
+#define TAO_Notify_SEQUENCEPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -22,27 +22,27 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
 /**
- * @class TAO_NS_SequencePushSupplier
+ * @class TAO_Notify_SequencePushSupplier
  *
  * @brief Wrapper for the SequencePushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_SequencePushSupplier : public TAO_NS_Supplier
+class TAO_Notify_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
-  TAO_NS_SequencePushSupplier (TAO_NS_ProxyConsumer* proxy);
+  TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy);
 
   /// Destructor
-  ~TAO_NS_SequencePushSupplier ();
+  ~TAO_Notify_SequencePushSupplier ();
 
   /// Init
   void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
-  /// TAO_NS_Destroy_Callback methods
+  /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
 protected:
@@ -55,4 +55,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPUSHSUPPLIER_H */
+#endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 70c5548d89d..375d1d8798c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SERVICE_H
-#define TAO_NS_SERVICE_H
+#ifndef TAO_Notify_SERVICE_H
+#define TAO_Notify_SERVICE_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -50,11 +50,11 @@ public:
 
 #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory"
 
-#define TAO_NS_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service"
+#define TAO_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service"
 
-#define TAO_NS_COS_NOTIFICATION_SERVICE_NAME "TAO_CosNotify_Service"
+#define TAO_COS_NOTIFICATION_SERVICE_NAME "TAO_CosNotify_Service"
 
-#define TAO_NS_RT_NOTIFICATION_SERVICE_NAME "TAO_RT_Notify_Service"
+#define TAO_RT_NOTIFICATION_SERVICE_NAME "TAO_RT_Notify_Service"
 
 #include "ace/post.h"
-#endif /* TAO_NS_SERVICE_H */
+#endif /* TAO_Notify_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 991d872ed41..06d5f4f871e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -6,20 +6,20 @@
 #include "RT_StructuredProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_RT_StructuredProxyPushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$id$")
 
-TAO_NS_RT_StructuredProxyPushSupplier::TAO_NS_RT_StructuredProxyPushSupplier (void)
+TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
 {
 }
 
-TAO_NS_RT_StructuredProxyPushSupplier::~TAO_NS_RT_StructuredProxyPushSupplier ()
+TAO_Notify_RT_StructuredProxyPushSupplier::~TAO_Notify_RT_StructuredProxyPushSupplier ()
 {
 }
 
 CORBA::Object_ptr
-TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var object = TAO_NS_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Obtain our ref.
@@ -32,7 +32,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -43,7 +43,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_A
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
@@ -51,7 +51,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_A
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -62,7 +62,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* ev
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
@@ -70,13 +70,13 @@ TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* ev
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
   this->push (event.get () ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
   this->push_no_filtering (event.get () ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index b3516b05ce3..7d10169b487 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
-#define TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
+#define TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../rt_notify_export.h"
@@ -22,34 +22,34 @@
 #include "StructuredProxyPushSupplier.h"
 
 /**
- * @class TAO_NS_RT_StructuredProxyPushSupplier
+ * @class TAO_Notify_RT_StructuredProxyPushSupplier
  *
  * @brief
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_StructuredProxyPushSupplier : public virtual TAO_NS_StructuredProxyPushSupplier
+class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier : public virtual TAO_Notify_StructuredProxyPushSupplier
 {
 public:
   /// Constuctor
-  TAO_NS_RT_StructuredProxyPushSupplier (void);
+  TAO_Notify_RT_StructuredProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_RT_StructuredProxyPushSupplier ();
+  ~TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Activate this object and obtain the Event_Forwarder interface.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
 private:
   /// Our ref.
@@ -61,4 +61,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index b12fc8978e2..1ce4ede4465 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -6,13 +6,13 @@
 #include "StructuredEvent.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredEvent, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
 #include "../PropertySeq.h"
 #include "../Consumer.h"
 #include "tao/debug.h"
 
-TAO_NS_StructuredEvent_No_Copy::TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
+TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
   : notification_ (&notification), type_ (notification.header.fixed_header.event_type)
 {
   const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
@@ -26,30 +26,30 @@ TAO_NS_StructuredEvent_No_Copy::TAO_NS_StructuredEvent_No_Copy (const CosNotific
     }
 }
 
-const TAO_NS_EventType&
-TAO_NS_StructuredEvent_No_Copy::type (void) const
+const TAO_Notify_EventType&
+TAO_Notify_StructuredEvent_No_Copy::type (void) const
 {
   return this->type_;
 }
 
-TAO_NS_StructuredEvent_No_Copy::~TAO_NS_StructuredEvent_No_Copy ()
+TAO_Notify_StructuredEvent_No_Copy::~TAO_Notify_StructuredEvent_No_Copy ()
 {
 }
 
-TAO_NS_Event*
-TAO_NS_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_Event*
+TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_NS_Event* copy;
+  TAO_Notify_Event* copy;
 
   ACE_NEW_THROW_EX (copy,
-                    TAO_NS_StructuredEvent (*this->notification_),
+                    TAO_Notify_StructuredEvent (*this->notification_),
                     CORBA::NO_MEMORY ());
 
   return copy;
 }
 
 CORBA::Boolean
-TAO_NS_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -59,13 +59,13 @@ TAO_NS_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
+TAO_Notify_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
 {
   notification = *this->notification_;
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -76,46 +76,46 @@ TAO_NS_StructuredEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_structured_no_filtering (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (*this->notification_, any);
+  TAO_Notify_Event::translate (*this->notification_, any);
 
   forwarder->forward_any (any ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (*this->notification_, any);
+  TAO_Notify_Event::translate (*this->notification_, any);
 
   forwarder->forward_any_no_filtering (any ACE_ENV_ARG_PARAMETER);
 }
 
 /*****************************************************************************************************/
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification)
-  : TAO_NS_StructuredEvent_No_Copy (notification)
+TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent& notification)
+  : TAO_Notify_StructuredEvent_No_Copy (notification)
     , notification_copy (notification)
 {
   this->notification_ = &notification_copy;
 }
 
-TAO_NS_StructuredEvent::~TAO_NS_StructuredEvent ()
+TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 175913c898c..d2c81dc79ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -8,8 +8,8 @@
  *
  *
  */
-#ifndef TAO_NS_STRUCTUREDEVENT_H
-#define TAO_NS_STRUCTUREDEVENT_H
+#ifndef TAO_Notify_STRUCTUREDEVENT_H
+#define TAO_Notify_STRUCTUREDEVENT_H
 
 #include "ace/pre.h"
 #include "../notify_export.h"
@@ -23,23 +23,23 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_StructuredEvent_No_Copy
+ * @class TAO_Notify_StructuredEvent_No_Copy
  *
  * @brief StructuredEvent implementation.
  *
  */
 
-class TAO_Notify_Export TAO_NS_StructuredEvent_No_Copy : public TAO_NS_Event
+class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent& notification);
+  TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent& notification);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent_No_Copy ();
+  ~TAO_Notify_StructuredEvent_No_Copy ();
 
   /// Copy the event.
-  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
 
   CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
@@ -47,10 +47,10 @@ public:
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Get the event type.
-  virtual const TAO_NS_EventType& type (void) const;
+  virtual const TAO_Notify_EventType& type (void) const;
 
   /// Push event to consumer
-  virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
   virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
@@ -69,25 +69,25 @@ protected:
   const CosNotification::StructuredEvent* notification_;
 
   /// Our type.
-  const TAO_NS_EventType type_;
+  const TAO_Notify_EventType type_;
 };
 
 /*****************************************************************************************************/
 
 /**
- * @class TAO_NS_StructuredEvent
+ * @class TAO_Notify_StructuredEvent
  *
  * @brief StructuredEvent implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredEvent : public TAO_NS_StructuredEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification);
+  TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent& notification);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent ();
+  ~TAO_Notify_StructuredEvent ();
 
 protected:
   /// Copy of the Event.
@@ -99,4 +99,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDEVENT_H */
+#endif /* TAO_Notify_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 2d80fd27dae..6565a2c701f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "StructuredProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "ace/Auto_Ptr.h"
@@ -17,16 +17,16 @@ ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$")
 #include "../Method_Request_Lookup.h"
 #include "../Worker_Task.h"
 
-TAO_NS_StructuredProxyPushConsumer::TAO_NS_StructuredProxyPushConsumer (void)
+TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
 {
 }
 
-TAO_NS_StructuredProxyPushConsumer::~TAO_NS_StructuredProxyPushConsumer ()
+TAO_Notify_StructuredProxyPushConsumer::~TAO_Notify_StructuredProxyPushConsumer ()
 {
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::release (void)
+TAO_Notify_StructuredProxyPushConsumer::release (void)
 {
   if (this->supplier_)
     this->supplier_->release ();
@@ -36,10 +36,10 @@ TAO_NS_StructuredProxyPushConsumer::release (void)
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_StructuredProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_StructuredProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -48,7 +48,7 @@ TAO_NS_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -57,16 +57,16 @@ TAO_NS_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
   // Convert Supplier to Base Type
-  TAO_NS_StructuredPushSupplier * supplier;
+  TAO_Notify_StructuredPushSupplier * supplier;
   ACE_NEW_THROW_EX (supplier,
-                    TAO_NS_StructuredPushSupplier (this),
+                    TAO_Notify_StructuredPushSupplier (this),
                     CORBA::NO_MEMORY ());
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
@@ -76,7 +76,7 @@ TAO_NS_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyC
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -92,15 +92,15 @@ TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  TAO_NS_StructuredEvent_No_Copy event (notification);
+  TAO_Notify_StructuredEvent_No_Copy event (notification);
 
-  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 70ddb535673..8433c1d1dc6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H
-#define TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H
+#ifndef TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H
+#define TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -30,21 +30,21 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_StructuredProxyPushConsumer
+ * @class TAO_Notify_StructuredProxyPushConsumer
  *
  * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredProxyPushConsumer : public virtual TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredProxyPushConsumer (void);
+  TAO_Notify_StructuredProxyPushConsumer (void);
 
   /// Destructor
-  ~TAO_NS_StructuredProxyPushConsumer ();
+  ~TAO_Notify_StructuredProxyPushConsumer ();
 
   /// Release
   virtual void release (void);
@@ -95,4 +95,4 @@ virtual void push_structured_event (
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H */
+#endif /* TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 4072b24f681..4681631f6cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -10,21 +10,21 @@
 #include "StructuredProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushSupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
 
-TAO_NS_StructuredProxyPushSupplier::TAO_NS_StructuredProxyPushSupplier (void)
+TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
 {
 }
 
-TAO_NS_StructuredProxyPushSupplier::~TAO_NS_StructuredProxyPushSupplier ()
+TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier ()
 {
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_StructuredProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_StructuredProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -33,7 +33,7 @@ TAO_NS_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::release (void)
+TAO_Notify_StructuredProxyPushSupplier::release (void)
 {
   if (this->consumer_)
     this->consumer_->release ();
@@ -43,7 +43,7 @@ TAO_NS_StructuredProxyPushSupplier::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -52,7 +52,7 @@ TAO_NS_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -60,9 +60,9 @@ TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyC
                    ))
 {
   // Convert Consumer to Base Type
-  TAO_NS_StructuredPushConsumer* consumer;
+  TAO_Notify_StructuredPushConsumer* consumer;
   ACE_NEW_THROW_EX (consumer,
-                    TAO_NS_StructuredPushConsumer (this),
+                    TAO_Notify_StructuredPushConsumer (this),
                     CORBA::NO_MEMORY ());
 
   consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
@@ -72,7 +72,7 @@ TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyC
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 922122dc849..71093030f77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H
-#define TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H
+#define TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -32,26 +32,26 @@
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
+TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 /**
- * @class TAO_NS_StructuredProxyPushSupplier
+ * @class TAO_Notify_StructuredProxyPushSupplier
  *
  * @brief Implements the CosNotifyChannelAdmin::StructuredProxyPushSupplier methods.
  *
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredProxyPushSupplier : public virtual TAO_NS_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredProxyPushSupplier (void);
+  TAO_Notify_StructuredProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_StructuredProxyPushSupplier ();
+  ~TAO_Notify_StructuredProxyPushSupplier ();
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
@@ -95,4 +95,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 7a9aff05883..185ffe305a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -7,19 +7,19 @@
 #include "StructuredPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredPushConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
-TAO_NS_StructuredPushConsumer::TAO_NS_StructuredPushConsumer (TAO_NS_ProxySupplier* proxy)
-  :TAO_NS_Consumer (proxy)
+TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy)
+  :TAO_Notify_Consumer (proxy)
 {
 }
 
-TAO_NS_StructuredPushConsumer::~TAO_NS_StructuredPushConsumer ()
+TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 {
 }
 
 void
-TAO_NS_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
 
@@ -28,36 +28,36 @@ TAO_NS_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr p
 }
 
 void
-TAO_NS_StructuredPushConsumer::release (void)
+TAO_Notify_StructuredPushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (event, notification);
+  TAO_Notify_Event::translate (event, notification);
 
   this->push_consumer_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index d0e950a34c5..6687ace54d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHCONSUMER_H
-#define TAO_NS_STRUCTUREDPUSHCONSUMER_H
+#ifndef TAO_Notify_STRUCTUREDPUSHCONSUMER_H
+#define TAO_Notify_STRUCTUREDPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -22,34 +22,34 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Consumer.h"
 
-class TAO_NS_ProxySupplier;
+class TAO_Notify_ProxySupplier;
 
 /**
- * @class TAO_NS_StructuredPushConsumer
+ * @class TAO_Notify_StructuredPushConsumer
  *
  * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredPushConsumer : public TAO_NS_Consumer
+class TAO_Notify_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredPushConsumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Init the Consumer
   void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
 
   /// Destructor
-  ~TAO_NS_StructuredPushConsumer ();
+  ~TAO_Notify_StructuredPushConsumer ();
 
   /// Release
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -67,4 +67,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHCONSUMER_H */
+#endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 14bd28f93b1..12e343f11b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -6,19 +6,19 @@
 #include "StructuredPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredPushSupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
 
-TAO_NS_StructuredPushSupplier::TAO_NS_StructuredPushSupplier (TAO_NS_ProxyConsumer* proxy)
-  :TAO_NS_Supplier (proxy)
+TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy)
+  :TAO_Notify_Supplier (proxy)
 {
 }
 
-TAO_NS_StructuredPushSupplier::~TAO_NS_StructuredPushSupplier ()
+TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 {
 }
 
 void
-TAO_NS_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier);
 
@@ -26,7 +26,7 @@ TAO_NS_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr p
 }
 
 void
-TAO_NS_StructuredPushSupplier::release (void)
+TAO_Notify_StructuredPushSupplier::release (void)
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index 6c9456befb7..95f5ef23059 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHSUPPLIER_H
-#define TAO_NS_STRUCTUREDPUSHSUPPLIER_H
+#ifndef TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
+#define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -22,22 +22,22 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
 /**
- * @class TAO_NS_StructuredPushSupplier
+ * @class TAO_Notify_StructuredPushSupplier
  *
  * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredPushSupplier : public TAO_NS_Supplier
+class TAO_Notify_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredPushSupplier (TAO_NS_ProxyConsumer* proxy);
+  TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy);
 
   /// Destructor
-  ~TAO_NS_StructuredPushSupplier ();
+  ~TAO_Notify_StructuredPushSupplier ();
 
   /// Init
   void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
@@ -55,4 +55,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHSUPPLIER_H */
+#endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 0bb764718c6..c335eaf79aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -8,11 +8,11 @@
 
 ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$")
 
-TAO_NS_Subscription_Change_Worker::TAO_NS_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
+TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
 :added_ (added), removed_ (removed)
 {
 }
 
-TAO_NS_Subscription_Change_Worker::~TAO_NS_Subscription_Change_Worker ()
+TAO_Notify_Subscription_Change_Worker::~TAO_Notify_Subscription_Change_Worker ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index 2baea73b727..d64987ca1d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -22,7 +22,7 @@
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-class TAO_NS_Proxy;
+class TAO_Notify_Proxy;
 
 /**
  * @class TAO_Subscription_Change_Worker
@@ -30,17 +30,17 @@ class TAO_NS_Proxy;
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_NS_Proxy>
+class TAO_Notify_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy>
 {
 public:
   /// Constuctor
-  TAO_NS_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed);
+  TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed);
 
   /// Destructor
-  ~TAO_NS_Subscription_Change_Worker ();
+  ~TAO_Notify_Subscription_Change_Worker ();
 
   ///= TAO_ESF_Worker method
-  void work (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
 
 protected:
   const CosNotification::EventTypeSeq & added_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl
index cb6180d5d7a..e26ceb25fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.inl
@@ -3,7 +3,7 @@
 #include "Proxy.h"
 
 ACE_INLINE void
-TAO_NS_Subscription_Change_Worker::work (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
 {
   proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index 848e9d804b6..378463bf4b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -6,28 +6,28 @@
 #include "Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Supplier, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$")
 
 #include "ProxyConsumer.h"
 #include "Proxy.h"
 
-TAO_NS_Supplier::TAO_NS_Supplier (TAO_NS_ProxyConsumer* proxy)
+TAO_Notify_Supplier::TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy)
   :proxy_ (proxy)
 {
 }
 
-TAO_NS_Supplier::~TAO_NS_Supplier ()
+TAO_Notify_Supplier::~TAO_Notify_Supplier ()
 {
 }
 
-TAO_NS_Proxy*
-TAO_NS_Supplier::proxy (void)
+TAO_Notify_Proxy*
+TAO_Notify_Supplier::proxy (void)
 {
   return this->proxy_consumer ();
 }
 
 void
-TAO_NS_Supplier::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
+TAO_Notify_Supplier::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
                                      ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (this->subscribe_.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index f24bddae07c..bc1bcd8a45b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIER_H
-#define TAO_NS_SUPPLIER_H
+#ifndef TAO_Notify_SUPPLIER_H
+#define TAO_Notify_SUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,28 +22,28 @@
 #include "Peer.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
 /**
- * @class TAO_NS_Supplier
+ * @class TAO_Notify_Supplier
  *
  * @brief Base Wrappers for Suppliers that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_Supplier : public TAO_NS_Peer
+class TAO_Notify_Export TAO_Notify_Supplier : public TAO_Notify_Peer
 {
 public:
   /// Constuctor
-  TAO_NS_Supplier (TAO_NS_ProxyConsumer* proxy);
+  TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy);
 
   /// Destructor
-  ~TAO_NS_Supplier ();
+  ~TAO_Notify_Supplier ();
 
   /// Access Specific Proxy.
-  TAO_NS_ProxyConsumer* proxy_consumer (void);
+  TAO_Notify_ProxyConsumer* proxy_consumer (void);
 
   /// Access Base Proxy.
-  virtual TAO_NS_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy (void);
 
 protected:
   /// Dispatch updates implementation.
@@ -52,7 +52,7 @@ protected:
                                    ACE_ENV_ARG_DECL);
 
   /// The proxy that we associate with.
-  TAO_NS_ProxyConsumer* proxy_;
+  TAO_Notify_ProxyConsumer* proxy_;
 
   /// Interface that accepts subscription_changes
   CosNotifyComm::NotifySubscribe_var subscribe_;
@@ -63,4 +63,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIER_H */
+#endif /* TAO_Notify_SUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
index 6df91e0fd9a..6d1c528c149 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
@@ -1,7 +1,7 @@
 // $Id$
 
-ACE_INLINE TAO_NS_ProxyConsumer*
-TAO_NS_Supplier::proxy_consumer (void)
+ACE_INLINE TAO_Notify_ProxyConsumer*
+TAO_Notify_Supplier::proxy_consumer (void)
 {
   return this->proxy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index fc7d19ac6fc..4d8b242a3ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -6,7 +6,7 @@
 #include "SupplierAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_SupplierAdmin, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_SupplierAdmin, "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Builder.h"
@@ -17,55 +17,55 @@ ACE_RCSID(RT_Notify, TAO_NS_SupplierAdmin, "$Id$")
 #include "Seq_Worker_T.h"
 #include "Properties.h"
 
-typedef TAO_NS_Find_Worker_T<TAO_NS_Proxy
+typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>
-TAO_NS_ProxyConsumer_Find_Worker;
+TAO_Notify_ProxyConsumer_Find_Worker;
 
-typedef TAO_NS_Seq_Worker_T<TAO_NS_Proxy> TAO_NS_Proxy_Seq_Worker;
+typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
-TAO_NS_SupplierAdmin::TAO_NS_SupplierAdmin (void)
+TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin (void)
 {
 }
 
-TAO_NS_SupplierAdmin::~TAO_NS_SupplierAdmin ()
+TAO_Notify_SupplierAdmin::~TAO_Notify_SupplierAdmin ()
 {
 }
 
 void
-TAO_NS_SupplierAdmin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Admin::init (ec ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const CosNotification::QoSProperties &default_sa_qos =
-    TAO_NS_PROPERTIES::instance ()->default_supplier_admin_qos_properties ();
+    TAO_Notify_PROPERTIES::instance ()->default_supplier_admin_qos_properties ();
 
   this->set_qos (default_sa_qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SupplierAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_NS_SupplierAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_NS_SupplierAdmin::release (void)
+TAO_Notify_SupplierAdmin::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -80,26 +80,26 @@ TAO_NS_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_NS_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_NS_SupplierAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_NS_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype
+TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype
                                                          , CosNotifyChannelAdmin::ProxyID_out proxy_id
                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -110,7 +110,7 @@ TAO_NS_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::
 {
   CosNotification::QoSProperties initial_qos;
 
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
                                                                 , initial_qos
@@ -118,7 +118,7 @@ TAO_NS_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_NS_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::ClientType ctype,
+TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
                                                                   ACE_ENV_ARG_DECL
@@ -129,7 +129,7 @@ TAO_NS_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChann
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id,
                                                                 initial_qos
@@ -138,16 +138,16 @@ TAO_NS_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChann
 
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_NS_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return TAO_NS_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_NS_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -156,7 +156,7 @@ TAO_NS_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NS_SupplierAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -165,7 +165,7 @@ TAO_NS_SupplierAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NS_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -174,30 +174,30 @@ TAO_NS_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NS_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_Proxy_Seq_Worker seq_worker;
+  TAO_Notify_Proxy_Seq_Worker seq_worker;
 
   return seq_worker.create (*this->proxy_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_NS_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
                    ))
 {
-  TAO_NS_ProxyConsumer_Find_Worker find_worker;
+  TAO_Notify_ProxyConsumer_Find_Worker find_worker;
 
   return find_worker.resolve (proxy_id, *this->proxy_container_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
+TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed
                                     ACE_ENV_ARG_DECL
                                     )
@@ -207,8 +207,8 @@ TAO_NS_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
                    ))
 
 {
-  TAO_NS_EventTypeSeq seq_added (added);
-  TAO_NS_EventTypeSeq seq_removed (removed);
+  TAO_Notify_EventTypeSeq seq_added (added);
+  TAO_Notify_EventTypeSeq seq_removed (removed);
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -217,14 +217,14 @@ TAO_NS_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
 
     this->subscribed_types_.init (seq_added, seq_removed);
 
-    TAO_NS_Subscription_Change_Worker worker (added, removed);
+    TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
     this->proxy_container_->collection ()->for_each (&worker ACE_ENV_ARG_PARAMETER);
   }
 }
 
 CosNotifyFilter::FilterID
-TAO_NS_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -233,7 +233,7 @@ TAO_NS_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV
 }
 
 void
-TAO_NS_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
@@ -243,7 +243,7 @@ TAO_NS_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_AR
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_NS_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
@@ -253,7 +253,7 @@ TAO_NS_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_D
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_NS_SupplierAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -262,7 +262,7 @@ TAO_NS_SupplierAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -273,7 +273,7 @@ TAO_NS_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 /************** UNIMPLEMENTED METHODS ***************/
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_NS_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -282,7 +282,7 @@ TAO_NS_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NS_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -292,7 +292,7 @@ TAO_NS_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_NS_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
+TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -304,7 +304,7 @@ TAO_NS_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*req
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_NS_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/,
+TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/,
                                                          CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -318,18 +318,18 @@ TAO_NS_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Find_Worker_T<TAO_NS_Proxy
+template class TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>;
-template class TAO_NS_Seq_Worker_T<TAO_NS_Proxy>;
+template class TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Find_Worker_T<TAO_NS_Proxy
+#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
                              , CosNotifyChannelAdmin::ProxyNotFound>
-#pragma instantiate TAO_NS_Seq_Worker_T<TAO_NS_Proxy>
+#pragma instantiate TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index bd42ff139a6..94ed27b2165 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIERADMIN_H
-#define TAO_NS_SUPPLIERADMIN_H
+#ifndef TAO_Notify_SUPPLIERADMIN_H
+#define TAO_Notify_SUPPLIERADMIN_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -30,23 +30,23 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_SupplierAdmin
+ * @class TAO_Notify_SupplierAdmin
  *
  * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin
  *
  */
-class TAO_Notify_Export TAO_NS_SupplierAdmin : public virtual POA_NotifyExt::SupplierAdmin
-                                             , public virtual TAO_NS_Admin
+class TAO_Notify_Export TAO_Notify_SupplierAdmin : public virtual POA_NotifyExt::SupplierAdmin
+                                             , public virtual TAO_Notify_Admin
 {
 public:
   /// Constuctor
-  TAO_NS_SupplierAdmin (void);
+  TAO_Notify_SupplierAdmin (void);
 
   /// Destructor
-  ~TAO_NS_SupplierAdmin ();
+  ~TAO_Notify_SupplierAdmin ();
 
   /// Init
-  void init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
 
   /// ServantBase refcount methods.
   virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
@@ -200,4 +200,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIERADMIN_H */
+#endif /* TAO_Notify_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
index 9a1d8034548..8f3c76470a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIER_MAP_H
-#define TAO_NS_SUPPLIER_MAP_H
+#ifndef TAO_Notify_SUPPLIER_MAP_H
+#define TAO_Notify_SUPPLIER_MAP_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -23,13 +23,13 @@
 #include "ProxyConsumer.h"
 
 /**
- * @class TAO_NS_Supplier_Map
+ * @class TAO_Notify_Supplier_Map
  *
  * @brief The Event Map for Suppliers.
  *
  */
 
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_NS_Supplier_Map;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map;
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIER_MAP_H */
+#endif /* TAO_Notify_SUPPLIER_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index bc643f11b68..fd55554a028 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -6,31 +6,31 @@
 #include "ThreadPool_Task.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_ThreadPool_Task, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "Properties.h"
 #include "Timer_Queue.h"
 
-TAO_NS_ThreadPool_Task::TAO_NS_ThreadPool_Task (void)
+TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void)
   : buffering_strategy_ (0), shutdown_ (0), timer_ (0)
 {
 }
 
-TAO_NS_ThreadPool_Task::~TAO_NS_ThreadPool_Task ()
+TAO_Notify_ThreadPool_Task::~TAO_Notify_ThreadPool_Task ()
 {
   delete this->buffering_strategy_;
 }
 
 int
-TAO_NS_ThreadPool_Task::init (int argc, char **argv)
+TAO_Notify_ThreadPool_Task::init (int argc, char **argv)
 {
   return this->ACE_Task<ACE_NULL_SYNCH>::init (argc, argv);
 }
 
-TAO_NS_Timer*
-TAO_NS_ThreadPool_Task::timer (void)
+TAO_Notify_Timer*
+TAO_Notify_ThreadPool_Task::timer (void)
 {
   this->timer_->_incr_refcnt ();
 
@@ -38,29 +38,29 @@ TAO_NS_ThreadPool_Task::timer (void)
 }
 
 void
-TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties_var& admin_properties  ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties_var& admin_properties  ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->timer_,
-                    TAO_NS_Timer_Queue (),
+                    TAO_Notify_Timer_Queue (),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (this->buffering_strategy_,
-                    TAO_NS_Buffering_Strategy (*msg_queue (), admin_properties, 1),
+                    TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties, 1),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
   long flags = THR_NEW_LWP | THR_JOINABLE;
 
   CORBA::ORB_var orb =
-    TAO_NS_PROPERTIES::instance()->orb ();
+    TAO_Notify_PROPERTIES::instance()->orb ();
 
   flags |=
     orb->orb_core ()->orb_params ()->thread_creation_flags ();
 
   // Increment the count on this object by the number of threads using it.
   {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->TAO_NS_Refcountable::lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->TAO_Notify_Refcountable::lock_);
 
     this->refcount_+=tp_params.static_threads;
   }
@@ -74,7 +74,7 @@ TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_
       // Decrement the count on this object. We know that this object's owner is holding a count on this object so
       // we can neglect our responsibility of checking if the refcount is decremented to 0.
       {
-        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->TAO_NS_Refcountable::lock_);
+        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->TAO_Notify_Refcountable::lock_);
 
         this->refcount_-=tp_params.static_threads;
       }
@@ -95,9 +95,9 @@ TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_
 }
 
 void
-TAO_NS_ThreadPool_Task::execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Method_Request& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (this->buffering_strategy_->enqueue (request_copy) == -1)
     {
@@ -108,9 +108,9 @@ TAO_NS_ThreadPool_Task::execute (TAO_NS_Method_Request_No_Copy& method_request A
 }
 
 int
-TAO_NS_ThreadPool_Task::svc (void)
+TAO_Notify_ThreadPool_Task::svc (void)
 {
-  TAO_NS_Method_Request* method_request;
+  TAO_Notify_Method_Request* method_request;
 
   while (!shutdown_)
     {
@@ -157,7 +157,7 @@ TAO_NS_ThreadPool_Task::svc (void)
 }
 
 void
-TAO_NS_ThreadPool_Task::shutdown (void)
+TAO_Notify_ThreadPool_Task::shutdown (void)
 {
   this->shutdown_ = 1;
 
@@ -167,7 +167,7 @@ TAO_NS_ThreadPool_Task::shutdown (void)
 }
 
 void
-TAO_NS_ThreadPool_Task::release (void)
+TAO_Notify_ThreadPool_Task::release (void)
 {
   this->timer_->_decr_refcnt ();
 
@@ -175,7 +175,7 @@ TAO_NS_ThreadPool_Task::release (void)
 }
 
 int
-TAO_NS_ThreadPool_Task::close (u_long /*flags*/)
+TAO_Notify_ThreadPool_Task::close (u_long /*flags*/)
 {
   this->_decr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 46ea7570770..230e36bdab1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_THREADPOOL_TASK_H
-#define TAO_NS_THREADPOOL_TASK_H
+#ifndef TAO_Notify_THREADPOOL_TASK_H
+#define TAO_Notify_THREADPOOL_TASK_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,25 +25,25 @@
 #include "AdminProperties.h"
 #include "Worker_Task.h"
 
-class TAO_NS_Buffering_Strategy;
-class TAO_NS_Timer_Queue;
+class TAO_Notify_Buffering_Strategy;
+class TAO_Notify_Timer_Queue;
 
 /**
- * @class TAO_NS_ThreadPool_Task
+ * @class TAO_Notify_ThreadPool_Task
  *
  * @brief Implements a Thread Pool Worker Task.
  *
  */
-class TAO_Notify_Export TAO_NS_ThreadPool_Task : public TAO_NS_Worker_Task, ACE_Task<ACE_NULL_SYNCH>
+class TAO_Notify_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, ACE_Task<ACE_NULL_SYNCH>
 {
-  friend class TAO_NS_Method_Request_Shutdown;
+  friend class TAO_Notify_Method_Request_Shutdown;
 
 public:
   /// Constuctor
-  TAO_NS_ThreadPool_Task (void);
+  TAO_Notify_ThreadPool_Task (void);
 
   /// Destructor
-  ~TAO_NS_ThreadPool_Task ();
+  ~TAO_Notify_ThreadPool_Task ();
 
   /// Call the base class init
   virtual int init (int argc, char **argv);
@@ -54,22 +54,22 @@ public:
   virtual void release (void);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Queue the request
-  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
 
   /// Shutdown task
   virtual void shutdown (void);
 
   /// Update QoS Properties.
-  virtual void update_qos_properties (const TAO_NS_QoSProperties& qos_properties);
+  virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// The object used by clients to register timers.
-  virtual TAO_NS_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer (void);
 
   /// Access the Buffering Strategy.
-  TAO_NS_Buffering_Strategy* buffering_strategy (void);
+  TAO_Notify_Buffering_Strategy* buffering_strategy (void);
 
 protected:
     /// task svc
@@ -77,13 +77,13 @@ protected:
 
 private:
   /// The buffering strategy to use.
-  TAO_NS_Buffering_Strategy* buffering_strategy_;
+  TAO_Notify_Buffering_Strategy* buffering_strategy_;
 
   /// Shutdown
   int shutdown_;
 
   /// The Queue based timer.
-  TAO_NS_Timer_Queue* timer_;
+  TAO_Notify_Timer_Queue* timer_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -91,4 +91,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_THREADPOOL_TASK_H */
+#endif /* TAO_Notify_THREADPOOL_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl
index 27f363d90ce..275b8c9aaca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.inl
@@ -3,13 +3,13 @@
 #include "Buffering_Strategy.h"
 
 ACE_INLINE void
-TAO_NS_ThreadPool_Task::update_qos_properties (const TAO_NS_QoSProperties& qos_properties)
+TAO_Notify_ThreadPool_Task::update_qos_properties (const TAO_Notify_QoSProperties& qos_properties)
 {
   this->buffering_strategy_->update_qos_properties (qos_properties);
 }
 
-ACE_INLINE TAO_NS_Buffering_Strategy*
-TAO_NS_ThreadPool_Task::buffering_strategy (void)
+ACE_INLINE TAO_Notify_Buffering_Strategy*
+TAO_Notify_ThreadPool_Task::buffering_strategy (void)
 {
   return this->buffering_strategy_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index 84423f943d6..8873f567e5a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_TIMER_H
-#define TAO_NS_TIMER_H
+#ifndef TAO_Notify_TIMER_H
+#define TAO_Notify_TIMER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,16 +25,16 @@
 class ACE_Event_Handler;
 
 /**
- * @class TAO_NS_Timer
+ * @class TAO_Notify_Timer
  *
  * @brief Interface for scheduling timers.
  *
  */
-class TAO_Notify_Export TAO_NS_Timer : public TAO_NS_Refcountable
+class TAO_Notify_Export TAO_Notify_Timer : public TAO_Notify_Refcountable
 {
 public:
   /// Destructor
-  virtual ~TAO_NS_Timer (){};
+  virtual ~TAO_Notify_Timer (){};
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
@@ -46,4 +46,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_TIMER_H */
+#endif /* TAO_Notify_TIMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index aa80ab73163..7e0f0643d86 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -6,25 +6,25 @@
 #include "Timer_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Timer_Queue, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Timer_Queue, "$id$")
 
-TAO_NS_Timer_Queue::TAO_NS_Timer_Queue (void)
+TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
 {
 }
 
-TAO_NS_Timer_Queue::~TAO_NS_Timer_Queue ()
+TAO_Notify_Timer_Queue::~TAO_Notify_Timer_Queue ()
 {
 }
 
 void
-TAO_NS_Timer_Queue::release (void)
+TAO_Notify_Timer_Queue::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 long
-TAO_NS_Timer_Queue::schedule_timer (ACE_Event_Handler *handler,
+TAO_Notify_Timer_Queue::schedule_timer (ACE_Event_Handler *handler,
                                     const ACE_Time_Value &delay_time,
                                     const ACE_Time_Value &interval)
 {
@@ -35,13 +35,13 @@ TAO_NS_Timer_Queue::schedule_timer (ACE_Event_Handler *handler,
 }
 
 int
-TAO_NS_Timer_Queue::cancel_timer (long timer_id)
+TAO_Notify_Timer_Queue::cancel_timer (long timer_id)
 {
   return this->timer_queue_.cancel (timer_id);
 }
 
 ACE_Timer_Queue&
-TAO_NS_Timer_Queue::impl (void)
+TAO_Notify_Timer_Queue::impl (void)
 {
   return this->timer_queue_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 52dea61911b..3d304b1f5af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_TIMER_QUEUE_H
-#define TAO_NS_TIMER_QUEUE_H
+#ifndef TAO_Notify_TIMER_QUEUE_H
+#define TAO_Notify_TIMER_QUEUE_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,19 +25,19 @@
 #include "ace/Timer_Heap.h"
 
 /**
- * @class TAO_NS_Timer_Queue
+ * @class TAO_Notify_Timer_Queue
  *
  * @brief ACE_Timer_Queue based timer.
  *
  */
-class TAO_Notify_Export TAO_NS_Timer_Queue : public TAO_NS_Timer
+class TAO_Notify_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer
 {
 public:
   /// Constuctor
-  TAO_NS_Timer_Queue (void);
+  TAO_Notify_Timer_Queue (void);
 
   /// Destructor
-  virtual ~TAO_NS_Timer_Queue ();
+  virtual ~TAO_Notify_Timer_Queue ();
 
   /// Release
   virtual void release (void);
@@ -63,4 +63,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_TIMER_QUEUE_H */
+#endif /* TAO_Notify_TIMER_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index 39c4ec55cf6..ea6ce77fee6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -6,34 +6,34 @@
 #include "Timer_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Timer_Reactor, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Timer_Reactor, "$Id$")
 
 #include "ace/Reactor.h"
 #include "tao/ORB_Core.h"
 #include "Properties.h"
 
-TAO_NS_Timer_Reactor::TAO_NS_Timer_Reactor (void)
+TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void)
   :reactor_ (0)
 {
   // Get the ORB
-  CORBA::ORB_var orb = TAO_NS_PROPERTIES::instance()->orb ();
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb ();
 
   this->reactor_ =  orb->orb_core ()->reactor ();
 }
 
-TAO_NS_Timer_Reactor::~TAO_NS_Timer_Reactor ()
+TAO_Notify_Timer_Reactor::~TAO_Notify_Timer_Reactor ()
 {
 }
 
 void
-TAO_NS_Timer_Reactor::release (void)
+TAO_Notify_Timer_Reactor::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 long
-TAO_NS_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler,
+TAO_Notify_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler,
                                const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval)
 {
@@ -41,7 +41,7 @@ TAO_NS_Timer_Reactor::schedule_timer (ACE_Event_Handler *handler,
 }
 
 int
-TAO_NS_Timer_Reactor::cancel_timer (long timer_id)
+TAO_Notify_Timer_Reactor::cancel_timer (long timer_id)
 {
   return this->reactor_->cancel_timer (timer_id);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 67953bb5576..2bfe3928a09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_TIMER_REACTOR_H
-#define TAO_NS_TIMER_REACTOR_H
+#ifndef TAO_Notify_TIMER_REACTOR_H
+#define TAO_Notify_TIMER_REACTOR_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,19 +24,19 @@
 class ACE_Reactor;
 
 /**
- * @class TAO_NS_Timer_Reactor
+ * @class TAO_Notify_Timer_Reactor
  *
  * @brief Reactor::instance based timer. The timers are dispatched by the main thread.
  *
  */
-class TAO_Notify_Export TAO_NS_Timer_Reactor : public TAO_NS_Timer
+class TAO_Notify_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer
 {
 public:
   /// Constuctor
-  TAO_NS_Timer_Reactor (void);
+  TAO_Notify_Timer_Reactor (void);
 
   /// Destructor
-  virtual ~TAO_NS_Timer_Reactor ();
+  virtual ~TAO_Notify_Timer_Reactor ();
 
   /// Release
   virtual void release (void);
@@ -59,4 +59,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_TIMER_REACTOR_H */
+#endif /* TAO_Notify_TIMER_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index 317d4fc3c3b..ce36af1612b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -6,17 +6,17 @@
 #include "Worker_Task.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Worker_Task, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$")
 
-TAO_NS_Worker_Task::TAO_NS_Worker_Task (void)
+TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
 {
 }
 
-TAO_NS_Worker_Task::~TAO_NS_Worker_Task ()
+TAO_Notify_Worker_Task::~TAO_Notify_Worker_Task ()
 {
 }
 
 void
-TAO_NS_Worker_Task::update_qos_properties (const TAO_NS_QoSProperties& /*qos_properties*/)
+TAO_Notify_Worker_Task::update_qos_properties (const TAO_Notify_QoSProperties& /*qos_properties*/)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 082994f3511..03418434f75 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_WORKER_TASK_H
-#define TAO_NS_WORKER_TASK_H
+#ifndef TAO_Notify_WORKER_TASK_H
+#define TAO_Notify_WORKER_TASK_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,13 +22,13 @@
 #include "Method_Request.h"
 #include "Refcountable.h"
 
-class TAO_NS_AdminProperties;
-class TAO_NS_QoSProperties;
-class TAO_NS_Timer;
-class TAO_NS_Buffering_Strategy;
+class TAO_Notify_AdminProperties;
+class TAO_Notify_QoSProperties;
+class TAO_Notify_Timer;
+class TAO_Notify_Buffering_Strategy;
 
 /**
- * @class TAO_NS_Worker_Task
+ * @class TAO_Notify_Worker_Task
  *
  * @brief Base Worker Task.
  *
@@ -36,30 +36,30 @@ class TAO_NS_Buffering_Strategy;
  * the <shutdown> method should be called to release memory.
  *
  */
-class TAO_Notify_Export TAO_NS_Worker_Task : public TAO_NS_Refcountable
+class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable
 {
 public:
   /// Constuctor
-  TAO_NS_Worker_Task (void);
+  TAO_Notify_Worker_Task (void);
 
   /// Update QoS Properties.
-  virtual void update_qos_properties (const TAO_NS_QoSProperties& qos_properties);
+  virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
+  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
 
   /// The object used by clients to register timers.
-  virtual TAO_NS_Timer* timer (void) = 0;
+  virtual TAO_Notify_Timer* timer (void) = 0;
 
-  virtual TAO_NS_Buffering_Strategy* buffering_strategy (void) = 0;
+  virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void) = 0;
 
 protected:
   /// Destructor
-  virtual ~TAO_NS_Worker_Task ();
+  virtual ~TAO_Notify_Worker_Task ();
 };
 
 #if defined (__ACE_INLINE__)
@@ -67,4 +67,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_WORKER_TASK_H */
+#endif /* TAO_Notify_WORKER_TASK_H */
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index d614d319f88..0a0b8e9c67e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -13,7 +13,7 @@ AdminProperties_Task::AdminProperties_Task (void)
 }
 
 void
-AdminProperties_Task::init (TAO_Notify_StructuredPushSupplier *supplier, AdminProperties* client)
+AdminProperties_Task::init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client)
 {
   supplier_  = supplier;
   client_ = client;
@@ -322,9 +322,9 @@ AdminProperties::test_max_queue_length (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Create the supplier
-  TAO_Notify_StructuredPushSupplier *supplier = 0;
+  TAO_Notify_Tests_StructuredPushSupplier *supplier = 0;
   ACE_NEW (supplier,
-           TAO_Notify_StructuredPushSupplier ());
+           TAO_Notify_Tests_StructuredPushSupplier ());
 
   supplier->init (root_poa_.in ()
                   ACE_ENV_ARG_PARAMETER);
@@ -417,12 +417,12 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      TAO_Notify_StructuredPushSupplier *supplier;
+      TAO_Notify_Tests_StructuredPushSupplier *supplier;
 
       for (index = 0; index < this->suppliers_; ++index)
         {
           ACE_NEW (supplier,
-                   TAO_Notify_StructuredPushSupplier ());
+                   TAO_Notify_Tests_StructuredPushSupplier ());
           supplier->init (root_poa_.in ()
                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -459,12 +459,12 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      TAO_Notify_StructuredPushConsumer *consumer;
+      TAO_Notify_Tests_StructuredPushConsumer *consumer;
 
       for (index = 0; index < this->consumers_; ++index)
         {
           ACE_NEW (consumer,
-                   TAO_Notify_StructuredPushConsumer ());
+                   TAO_Notify_Tests_StructuredPushConsumer ());
           consumer->init (root_poa_.in ()
                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index ae5cc3da45e..5090fa15f31 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -24,7 +24,7 @@
 class AdminProperties;
 /***************************************************************************/
 
-class AdminProperties_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class AdminProperties_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
   friend class AdminProperties;
 public:
@@ -60,7 +60,7 @@ public:
   // Constructor.
 
   /// Init this object.
-  void init (TAO_Notify_StructuredPushSupplier *supplier, AdminProperties* client);
+  void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
 
   virtual int init (int argc, ACE_TCHAR *argv []);
 
@@ -69,7 +69,7 @@ public:
 
 private:
   /// Supplier
-  TAO_Notify_StructuredPushSupplier *supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier *supplier_;
 
   /// Client Object.
   AdminProperties* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 5a77f8a241e..d66d372563f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -117,24 +117,24 @@ ConnectDisconnect::init (int argc,
 
   // Arrays of Consumers.
   ACE_NEW_RETURN (this->any_consumer_,
-                  TAO_Notify_PushConsumer*[this->consumers_],
+                  TAO_Notify_Tests_PushConsumer*[this->consumers_],
                   -1);
   ACE_NEW_RETURN (this->structured_consumer_,
-                 TAO_Notify_StructuredPushConsumer*[this->consumers_],
+                 TAO_Notify_Tests_StructuredPushConsumer*[this->consumers_],
                  -1);
   ACE_NEW_RETURN (this->sequence_consumer_,
-                  TAO_Notify_SequencePushConsumer*[this->consumers_],
+                  TAO_Notify_Tests_SequencePushConsumer*[this->consumers_],
                   -1);
 
   // Arrays of Suppliers.
   ACE_NEW_RETURN (this->any_supplier_,
-                  TAO_Notify_PushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_PushSupplier*[this->suppliers_],
                   -1);
   ACE_NEW_RETURN (this->structured_supplier_,
-                  TAO_Notify_StructuredPushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_StructuredPushSupplier*[this->suppliers_],
                   -1);
   ACE_NEW_RETURN (this->sequence_supplier_,
-                  TAO_Notify_SequencePushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_SequencePushSupplier*[this->suppliers_],
                   -1);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 4f560be9f2e..eb98ba33e2b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -101,14 +101,14 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer** any_consumer_;
-  TAO_Notify_StructuredPushConsumer** structured_consumer_;
-  TAO_Notify_SequencePushConsumer** sequence_consumer_;
+  TAO_Notify_Tests_PushConsumer** any_consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer** structured_consumer_;
+  TAO_Notify_Tests_SequencePushConsumer** sequence_consumer_;
   // Arrays of Consumers.
 
-  TAO_Notify_PushSupplier** any_supplier_;
-  TAO_Notify_StructuredPushSupplier** structured_supplier_;
-  TAO_Notify_SequencePushSupplier** sequence_supplier_;
+  TAO_Notify_Tests_PushSupplier** any_supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier** structured_supplier_;
+  TAO_Notify_Tests_SequencePushSupplier** sequence_supplier_;
   // arrays of Suppliers
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 7f5c2c389de..1c2ad251bcb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -30,7 +30,7 @@
 
 class Events;
 
-class Event_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class Event_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Event_StructuredPushConsumer (Events *test_client);
@@ -50,7 +50,7 @@ protected:
 
 /***************************************************************************/
 
-class Event_StructuredPushSupplier : public TAO_Notify_StructuredPushSupplier
+class Event_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
   Event_StructuredPushSupplier (Events * test_client);
@@ -114,10 +114,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_StructuredPushConsumer* consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_StructuredPushSupplier* supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 4eace18199c..a0f6e83f80b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -78,10 +78,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* consumer_;
+  TAO_Notify_Tests_PushConsumer* consumer_;
   // Consumer.
 
-  TAO_Notify_PushSupplier* supplier_;
+  TAO_Notify_Tests_PushSupplier* supplier_;
   // Supplier.
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index a6c9107126f..ec0758fbe6a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -165,9 +165,9 @@ MultiTypes::init (int argc,
   structured_consumer_ = new MultiTypes_StructuredPushConsumer (this);
   sequence_consumer_ = new MultiTypes_SequencePushConsumer (this);
 
-  any_supplier_ = new TAO_Notify_PushSupplier;
-  structured_supplier_ = new TAO_Notify_StructuredPushSupplier ();
-  sequence_supplier_ = new TAO_Notify_SequencePushSupplier ();
+  any_supplier_ = new TAO_Notify_Tests_PushSupplier;
+  structured_supplier_ = new TAO_Notify_Tests_StructuredPushSupplier ();
+  sequence_supplier_ = new TAO_Notify_Tests_SequencePushSupplier ();
 
   // Init and connect all consumers.
   structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 598518a896e..6b3ff26a83a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -35,7 +35,7 @@ class MultiTypes;
 
 /***************************************************************************/
 
-class MultiTypes_PushConsumer : public TAO_Notify_PushConsumer
+class MultiTypes_PushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
   MultiTypes_PushConsumer (MultiTypes* client);
@@ -55,7 +55,7 @@ protected:
 
 /***************************************************************************/
 
-class MultiTypes_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class MultiTypes_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   MultiTypes_StructuredPushConsumer (MultiTypes* client);
@@ -73,7 +73,7 @@ protected:
   MultiTypes* client_;
 };
 
-class MultiTypes_SequencePushConsumer : public TAO_Notify_SequencePushConsumer
+class MultiTypes_SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   MultiTypes_SequencePushConsumer (MultiTypes* client);
@@ -139,14 +139,14 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* any_consumer_;
-  TAO_Notify_StructuredPushConsumer* structured_consumer_;
-  TAO_Notify_SequencePushConsumer* sequence_consumer_;
+  TAO_Notify_Tests_PushConsumer* any_consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* structured_consumer_;
+  TAO_Notify_Tests_SequencePushConsumer* sequence_consumer_;
   // Consumers.
 
-  TAO_Notify_PushSupplier* any_supplier_;
-  TAO_Notify_StructuredPushSupplier* structured_supplier_;
-  TAO_Notify_SequencePushSupplier* sequence_supplier_;
+  TAO_Notify_Tests_PushSupplier* any_supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* structured_supplier_;
+  TAO_Notify_Tests_SequencePushSupplier* sequence_supplier_;
   // Suppliers
 
   // Count of Any events received;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 04c75b78c0f..19352ec0150 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -30,7 +30,7 @@
 
 class Sequence;
 
-class SequencePushConsumer : public TAO_Notify_SequencePushConsumer
+class SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   SequencePushConsumer (Sequence* client);
@@ -51,7 +51,7 @@ protected:
 
 /***************************************************************************/
 
-class SequencePushSupplier : public TAO_Notify_SequencePushSupplier
+class SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier
 {
 public:
   SequencePushSupplier (Sequence * test_client);
@@ -124,10 +124,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_SequencePushConsumer* consumer_;
+  TAO_Notify_Tests_SequencePushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_SequencePushSupplier* supplier_;
+  TAO_Notify_Tests_SequencePushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index b584e342035..93fb9b9ef5e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -31,7 +31,7 @@ class Simple_Test;
 
 /***************************************************************************/
 
-class Event_AnyPushConsumer : public TAO_Notify_PushConsumer
+class Event_AnyPushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
   Event_AnyPushConsumer (Simple_Test *test_client);
@@ -51,7 +51,7 @@ protected:
 
 /***************************************************************************/
 
-class Event_AnyPushSupplier : public TAO_Notify_PushSupplier
+class Event_AnyPushSupplier : public TAO_Notify_Tests_PushSupplier
 {
 public:
   Event_AnyPushSupplier (Simple_Test * test_client);
@@ -112,10 +112,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* consumer_;
+  TAO_Notify_Tests_PushConsumer* consumer_;
   // Consumer.
 
-  TAO_Notify_PushSupplier* supplier_;
+  TAO_Notify_Tests_PushSupplier* supplier_;
   // Supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index fcd5c25676b..20ebbc6bcb8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -30,7 +30,7 @@
 
 class Updates;
 
-class Updates_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class Updates_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Updates_StructuredPushConsumer (Updates *test_client);
@@ -49,7 +49,7 @@ protected:
 
 /***************************************************************************/
 
-class Updates_StructuredPushSupplier : public TAO_Notify_StructuredPushSupplier
+class Updates_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
   Updates_StructuredPushSupplier (Updates * test_client);
@@ -130,10 +130,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_StructuredPushConsumer* consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_StructuredPushSupplier* supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
index 26e9015628c..70abb0d32cd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -1,2 +1,5 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
+
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
\ No newline at end of file
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 ad530a83978..8041f156b35 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 #include "orbsvcs/TimeBaseC.h"
 
-class Notify_Structured_Push_Consumer: public TAO_Notify_StructuredPushConsumer
+class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Structured_Push_Consumer (
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index bfa95d3e7d4..03c7ce9214a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_StructuredPushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_StructuredPushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static int max_events = 20;
@@ -166,7 +166,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_StructuredPushSupplier (),
+                    TAO_Notify_Tests_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index 8e5839a77ea..e4139dd8f51 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_SequencePushConsumer.h"
 
 
-class Notify_Sequence_Push_Consumer: public TAO_Notify_SequencePushConsumer
+class Notify_Sequence_Push_Consumer: public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index 1e119072d5f..4b5ec086ce2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Structured_Push_Consumer: public TAO_Notify_StructuredPushConsumer
+class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Structured_Push_Consumer (
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index b96e69a79d8..d7d7daa05c2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_SequencePushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static CORBA::Boolean use_deadline_ordering = 0;
@@ -211,7 +211,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_SequencePushSupplier (),
+                    TAO_Notify_Tests_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index aee3a6ee9d1..47302392e00 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_StructuredPushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_StructuredPushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static CORBA::Boolean use_deadline_ordering = 0;
@@ -178,7 +178,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_StructuredPushSupplier (),
+                    TAO_Notify_Tests_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index d531e693560..5528afc167a 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -5,7 +5,7 @@
 int
 ACE_TMAIN (int argc, char *argv[])
 {
-  TAO_NS_Driver driver;
+  TAO_Notify_Tests_Driver driver;
 
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
index 4b5a53e862f..c01252c2762 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -1,16 +1,18 @@
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *
-TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
+
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
index fa25e57edff..b4c291b741a 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
@@ -1,5 +1,8 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_NS_RT_Test_FilterFactory () ""        
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
 
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
index 0910a40c30b..9259699d83f 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
@@ -11,15 +11,18 @@
 ##
 
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index e28c7e319f1..f3f2205226c 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Structured_Push_Consumer : public TAO_Notify_StructuredPushConsumer
+class Notify_Structured_Push_Consumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Structured_Push_Consumer (
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 94216129baa..f50a5bc3846 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -21,7 +21,7 @@
 // ******************************************************************
 
 static const unsigned int supplier_max = 32;
-static TAO_Notify_StructuredPushSupplier* suppliers[supplier_max] = {0};
+static TAO_Notify_Tests_StructuredPushSupplier* suppliers[supplier_max] = {0};
 static unsigned int supplier_count = 1;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
@@ -197,7 +197,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
     {
       // startup the supplier
       ACE_NEW_THROW_EX (suppliers[i],
-                        TAO_Notify_StructuredPushSupplier (),
+                        TAO_Notify_Tests_StructuredPushSupplier (),
                         CORBA::NO_MEMORY ());
       suppliers[i]->init (poa ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index 3a68a1cef1d..cfc0ffa4b1f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_SequencePushConsumer.h"
 
 
-class Notify_Sequence_Push_Consumer: public TAO_Notify_SequencePushConsumer
+class Notify_Sequence_Push_Consumer: public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 76e95b9b8ee..39aaf58786b 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Structured_Push_Consumer: public TAO_Notify_StructuredPushConsumer
+class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Structured_Push_Consumer (
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 31cd6f19d47..c28781d904d 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_SequencePushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static CORBA::Short order_policy = CosNotification::FifoOrder;
@@ -236,7 +236,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_SequencePushSupplier (),
+                    TAO_Notify_Tests_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index f4fcb1b5c93..eb2babf33ad 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_StructuredPushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_StructuredPushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static CORBA::Short order_policy = CosNotification::FifoOrder;
@@ -200,7 +200,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_StructuredPushSupplier (),
+                    TAO_Notify_Tests_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index a5a7b815796..679a88d1bd4 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -7,26 +7,26 @@ ACE_RCSID(lib, TAO_RT_Application_Command, "$id$")
 #include "../lib/LookupManager.h"
 #include "RT_Priority_Mapping.h"
 
-TAO_NS_RT_Application_Command::TAO_NS_RT_Application_Command (void)
+TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command (void)
 {
 }
 
-TAO_NS_RT_Application_Command::~TAO_NS_RT_Application_Command ()
+TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Command ()
 {
 }
 
 void
-TAO_NS_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Call the Base class.
-  TAO_NS_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ORB_var orb;
 
   LOOKUP_MANAGER->resolve (orb);
 
-  TAO_NS_RT_Priority_Mapping* mapping = new TAO_NS_RT_Priority_Mapping ();
+  TAO_Notify_Tests_RT_Priority_Mapping* mapping = new TAO_Notify_Tests_RT_Priority_Mapping ();
 
   mapping->init (orb.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index 84b1e841030..0f6f75194ef 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_APPLICATION_COMMAND_H
-#define TAO_NS_RT_APPLICATION_COMMAND_H
+#ifndef TAO_Notify_Tests_RT_APPLICATION_COMMAND_H
+#define TAO_Notify_Tests_RT_APPLICATION_COMMAND_H
 #include "ace/pre.h"
 
 #include "rt_notify_test_export.h"
@@ -22,22 +22,22 @@
 #include "../lib/Application_Command.h"
 
 /**
- * @class TAO_NS_RT_Application_Command
+ * @class TAO_Notify_Tests_RT_Application_Command
  *
  * @brief
  *
  */
-class TAO_RT_NOTIFY_TEST_Export TAO_NS_RT_Application_Command : public TAO_NS_Application_Command
+class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Application_Command : public TAO_Notify_Tests_Application_Command
 {
 public:
   /// Constuctor
-  TAO_NS_RT_Application_Command (void);
+  TAO_Notify_Tests_RT_Application_Command (void);
 
   /// Destructor
-  ~TAO_NS_RT_Application_Command ();
+  ~TAO_Notify_Tests_RT_Application_Command ();
 
   virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_APPLICATION_COMMAND_H */
+#endif /* TAO_Notify_Tests_RT_APPLICATION_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index f2f32d2e59e..9e53a038ded 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "../lib/Factories_Define.h"
 
-ACE_RCSID(lib, TAO_NS_Factories_Define, "$id$")
+ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$id$")
 
 #include "rt_notify_test_export.h"
 #include "../lib/Name.h"
@@ -9,17 +9,17 @@ ACE_RCSID(lib, TAO_NS_Factories_Define, "$id$")
 #include "RT_POA_Command.h"
 #include "RT_Application_Command.h"
 
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_RT_NOTIFY_TEST,TAO_NS_RT_POA_Command,TAO_NS_Name::poa_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_RT_NOTIFY_TEST,TAO_NS_RT_Application_Command,TAO_NS_Name::application_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_RT_NOTIFY_TEST,TAO_Notify_Tests_RT_POA_Command,TAO_Notify_Tests_Name::poa_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_RT_NOTIFY_TEST,TAO_Notify_Tests_RT_Application_Command,TAO_Notify_Tests_Name::application_command_factory);
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Command_Factory_T<TAO_NS_RT_POA_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_RT_Application_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_RT_POA_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_RT_Application_Command>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_RT_POA_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_RT_Application_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_RT_POA_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_RT_Application_Command>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index fbb7535ee47..fc656c1885c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(lib, TAO_RT_POA_Command, "$id$")
 #include "../lib/LookupManager.h"
 #include "../lib/Name.h"
 
-TAO_NS_RT_POA_Command::TAO_NS_RT_POA_Command (void)
+TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command (void)
   :priority_model_ (RTCORBA::CLIENT_PROPAGATED)
   , server_priority_ (0)
   , thread_pool_static_threads_ (0)
@@ -16,24 +16,24 @@ TAO_NS_RT_POA_Command::TAO_NS_RT_POA_Command (void)
 {
 }
 
-TAO_NS_RT_POA_Command::~TAO_NS_RT_POA_Command ()
+TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command ()
 {
 }
 
 const char*
-TAO_NS_RT_POA_Command::get_name (void)
+TAO_Notify_Tests_RT_POA_Command::get_name (void)
 {
-  return TAO_NS_RT_POA_Command::name ();
+  return TAO_Notify_Tests_RT_POA_Command::name ();
 }
 
 const char*
-TAO_NS_RT_POA_Command::name (void)
+TAO_Notify_Tests_RT_POA_Command::name (void)
 {
-  return TAO_NS_Name::poa_command;
+  return TAO_Notify_Tests_Name::poa_command;
 }
 
 void
-TAO_NS_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   const ACE_TCHAR *current_arg = 0;
 
@@ -177,7 +177,7 @@ TAO_NS_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
@@ -223,7 +223,7 @@ TAO_NS_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 {
   /*
     lanes bands priomodel
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index 796927f9f3c..f9dee59f406 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_POA_COMMAND_H
-#define TAO_NS_RT_POA_COMMAND_H
+#ifndef TAO_Notify_Tests_RT_POA_COMMAND_H
+#define TAO_Notify_Tests_RT_POA_COMMAND_H
 #include "ace/pre.h"
 
 #include "rt_notify_test_export.h"
@@ -25,19 +25,19 @@
 #include "../lib/Command.h"
 
 /**
- * @class TAO_NS_RT_POA_Command
+ * @class TAO_Notify_Tests_RT_POA_Command
  *
  * @brief Command for managing RTCORBA POAs.
  *
  */
-class TAO_RT_NOTIFY_TEST_Export TAO_NS_RT_POA_Command : public TAO_NS_Command
+class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_POA_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_RT_POA_Command (void);
+  TAO_Notify_Tests_RT_POA_Command (void);
 
   /// Destructor
-  ~TAO_NS_RT_POA_Command ();
+  ~TAO_Notify_Tests_RT_POA_Command ();
 
   /// Parse args and populate options.
   /// The arg_shifter options are read in the following manner: -Create <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
@@ -77,4 +77,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_POA_COMMAND_H */
+#endif /* TAO_Notify_Tests_RT_POA_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index afcd4f21648..cecdcbe5b72 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -6,12 +6,12 @@ ACE_RCSID(lib, RT_Priority_Mapping, "$id$")
 
 #include "../lib/LookupManager.h"
 
-TAO_NS_RT_Priority_Mapping::~TAO_NS_RT_Priority_Mapping (void)
+TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void)
 {
 }
 
 void
-TAO_NS_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager"
                                                               ACE_ENV_ARG_PARAMETER);
@@ -26,14 +26,14 @@ TAO_NS_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_NS_RT_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
+TAO_Notify_Tests_RT_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                     RTCORBA::NativePriority &native_priority)
 {
   return this->priority_mapping_->to_native (corba_priority, native_priority);
 }
 
 CORBA::Boolean
-TAO_NS_RT_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
+TAO_Notify_Tests_RT_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
                                 RTCORBA::Priority &corba_priority)
 {
   return this->priority_mapping_->to_CORBA (native_priority, corba_priority);
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 0eddf1f4439..f843ec71997 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_PRIORITY_MAPPING_H
-#define TAO_NS_RT_PRIORITY_MAPPING_H
+#ifndef TAO_Notify_Tests_RT_PRIORITY_MAPPING_H
+#define TAO_Notify_Tests_RT_PRIORITY_MAPPING_H
 #include "ace/pre.h"
 
 #include "rt_notify_test_export.h"
@@ -23,16 +23,16 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
 /**
- * @class TAO_NS_RT_Priority_Mapping
+ * @class TAO_Notify_Tests_RT_Priority_Mapping
  *
  * @brief Delegates to a RTCORBA::PriorityMapping
  *
  */
-class TAO_RT_NOTIFY_TEST_Export TAO_NS_RT_Priority_Mapping : public TAO_NS_Priority_Mapping
+class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Priority_Mapping : public TAO_Notify_Tests_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_NS_RT_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void);
 
   /// Init the Mapping manager.
   void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
@@ -51,4 +51,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_PRIORITY_MAPPING_H */
+#endif /* TAO_Notify_Tests_RT_PRIORITY_MAPPING_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index fabac9f966e..ea4ac1dadb6 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_SequencePushConsumer.h"
 
 
-class Notify_Sequence_Push_Consumer: public TAO_Notify_SequencePushConsumer
+class Notify_Sequence_Push_Consumer: public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
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 d9fae8364a4..62127227df9 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
@@ -21,7 +21,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_SequencePushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static int max_events = 6;  // 6 sets of 16
@@ -202,7 +202,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_SequencePushSupplier (),
+                    TAO_Notify_Tests_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index a34296fa34c..ab563bf0c89 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_SequencePushConsumer.h"
 
 
-class Notify_Sequence_Push_Consumer : public TAO_Notify_SequencePushConsumer
+class Notify_Sequence_Push_Consumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
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 2780ffe4567..180b5a4e2d6 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -20,7 +20,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_SequencePushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static int max_events = 2;  // 6 sets of 16
@@ -199,7 +199,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_SequencePushSupplier (),
+                    TAO_Notify_Tests_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index 470ddef7221..113fbc3030b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Push_Consumer: public TAO_Notify_StructuredPushConsumer
+class Notify_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Push_Consumer (const char* name);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 51d90144834..74a90e7f845 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -19,7 +19,7 @@
 static CORBA::Boolean go = 0;
 static CORBA::Short n_events = 1;
 static const char* ior_file = "supplier.ior";
-static TAO_Notify_StructuredPushSupplier* supplier = 0;
+static TAO_Notify_Tests_StructuredPushSupplier* supplier = 0;
 
 // ******************************************************************
 // Subroutine Section
@@ -130,7 +130,7 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                              ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (supplier,
-                    TAO_Notify_StructuredPushSupplier (),
+                    TAO_Notify_Tests_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index b95a57849f1..a5a4ebf8522 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Push_Consumer: public TAO_Notify_StructuredPushConsumer
+class Notify_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Push_Consumer (const char* name);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index 864f07a23a9..42efaa7bd1c 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -5,7 +5,7 @@
 #include "Notify_StructuredPushSupplier.h"
 
 
-class Notify_Push_Supplier: public TAO_Notify_StructuredPushSupplier
+class Notify_Push_Supplier: public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
   void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 30cbf6f982e..30c1d3a5268 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -9,19 +9,19 @@ ACE_RCSID(Notify, TAO_RT_Test_Filter, "$id$")
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/PortableServer/POA.h"
 
-TAO_NS_RT_Test_Filter::TAO_NS_RT_Test_Filter (void)
+TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void)
   : expected_pool_id_ (0)
     , expected_lane_id_ (0)
 {
 }
 
-TAO_NS_RT_Test_Filter::~TAO_NS_RT_Test_Filter ()
+TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
 {
 
 }
 
 char*
-TAO_NS_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -31,7 +31,7 @@ TAO_NS_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_NS_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
+TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
                                 ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
@@ -85,7 +85,7 @@ TAO_NS_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq&
 }
 
 void
-TAO_NS_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/,
+TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/,
                                    const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/
                                    ACE_ENV_ARG_DECL_NOT_USED
                                    )
@@ -99,7 +99,7 @@ TAO_NS_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSe
 }
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_NS_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/
+TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/
                                 ACE_ENV_ARG_DECL_NOT_USED
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -109,21 +109,21 @@ TAO_NS_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq &
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_NS_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
 
 void
-TAO_NS_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
-TAO_NS_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
@@ -138,7 +138,7 @@ TAO_NS_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_NS_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
+TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -148,7 +148,7 @@ TAO_NS_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
 }
 
 CORBA::Boolean
-TAO_NS_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification
+TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification
                                  ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -159,7 +159,7 @@ TAO_NS_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent
   ACE_CHECK_RETURN (0);
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO_NS_RT_Test_Filter (%x) ::match_structured (%t)\n", this));
+    ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this));
 
   TAO_POA *poa = this->_default_POA ()->_tao_poa_downcast();
 
@@ -250,7 +250,7 @@ TAO_NS_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent
 }
 
 CORBA::Boolean
-TAO_NS_RT_Test_Filter::match_typed (
+TAO_Notify_Tests_RT_Test_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
                             ACE_ENV_ARG_DECL
                             )
@@ -262,7 +262,7 @@ TAO_NS_RT_Test_Filter::match_typed (
 }
 
 CosNotifyFilter::CallbackID
-TAO_NS_RT_Test_Filter::attach_callback (
+TAO_Notify_Tests_RT_Test_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
                                 ACE_ENV_ARG_DECL
                                 )
@@ -273,7 +273,7 @@ TAO_NS_RT_Test_Filter::attach_callback (
 }
 
 void
-TAO_NS_RT_Test_Filter::detach_callback (
+TAO_Notify_Tests_RT_Test_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
                                 ACE_ENV_ARG_DECL
                                 )
@@ -284,7 +284,7 @@ TAO_NS_RT_Test_Filter::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_NS_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
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 311221bc5c7..d496f760cef 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_Test_FILTER_H
-#define TAO_NS_RT_Test_FILTER_H
+#ifndef TAO_Notify_Tests_RT_Test_FILTER_H
+#define TAO_Notify_Tests_RT_Test_FILTER_H
 #include "ace/pre.h"
 
 #include "rt_test_filter_export.h"
@@ -34,14 +34,14 @@
  * @brief Implementation of CosNotifyFilter::Filter servant.
  *
  */
-class TAO_RT_Test_Filter_Export TAO_NS_RT_Test_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
+class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
 {
 public:
   /// Constuctor
-  TAO_NS_RT_Test_Filter (void);
+  TAO_Notify_Tests_RT_Test_Filter (void);
 
   /// Destructor
-  ~TAO_NS_RT_Test_Filter ();
+  ~TAO_Notify_Tests_RT_Test_Filter ();
 
 protected:
   virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index 00e1e8254d4..d36bad91c5e 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -7,16 +7,16 @@ ACE_RCSID(Notify, TAO_RT_Test_FilterFactory, "$id$")
 #include "RT_Test_Filter.h"
 #include "tao/debug.h"
 
-TAO_NS_RT_Test_FilterFactory::TAO_NS_RT_Test_FilterFactory (void)
+TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory (void)
 {
 }
 
-TAO_NS_RT_Test_FilterFactory::~TAO_NS_RT_Test_FilterFactory ()
+TAO_Notify_Tests_RT_Test_FilterFactory::~TAO_Notify_Tests_RT_Test_FilterFactory ()
 {
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NS_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
@@ -26,14 +26,14 @@ TAO_NS_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_EN
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NS_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
                    ))
 {
   if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "(%P, %t)In TAO_NS_RT_Test_FilterFactory::create_filter\n"));
+    ACE_DEBUG ((LM_DEBUG, "(%P, %t)In TAO_Notify_Tests_RT_Test_FilterFactory::create_filter\n"));
 
   // @@: change to "ExTCL" later.
   if (ACE_OS::strcmp (constraint_grammar, "TCL") != 0 &&
@@ -43,10 +43,10 @@ TAO_NS_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_
 
 
   // Create the RefCounted servant.
-  TAO_NS_RT_Test_Filter* filter = 0;
+  TAO_Notify_Tests_RT_Test_Filter* filter = 0;
 
   ACE_NEW_THROW_EX (filter,
-                    TAO_NS_RT_Test_Filter (),
+                    TAO_Notify_Tests_RT_Test_Filter (),
                     CORBA::NO_MEMORY ());
 
   PortableServer::ServantBase_var filter_var (filter);
@@ -66,7 +66,7 @@ TAO_NS_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NS_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
+TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
                                                   ACE_ENV_ARG_DECL
                                                   )
@@ -78,4 +78,4 @@ TAO_NS_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_g
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ());
 }
 
-ACE_FACTORY_DEFINE (TAO_RT_Test_Filter, TAO_NS_RT_Test_FilterFactory)
+ACE_FACTORY_DEFINE (TAO_RT_Test_Filter, TAO_Notify_Tests_RT_Test_FilterFactory)
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 8d275197eb0..bff543cfc4a 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_Test_FILTERFACTORY_H
-#define TAO_NS_RT_Test_FILTERFACTORY_H
+#ifndef TAO_Notify_Tests_RT_Test_FILTERFACTORY_H
+#define TAO_Notify_Tests_RT_Test_FILTERFACTORY_H
 #include "ace/pre.h"
 
 #include "rt_test_filter_export.h"
@@ -30,23 +30,23 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_RT_Test_FilterFactory
+ * @class TAO_Notify_Tests_RT_Test_FilterFactory
  *
  * @brief
  *
  */
-class TAO_RT_Test_Filter_Export TAO_NS_RT_Test_FilterFactory : public virtual PortableServer::RefCountServantBase
+class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory : public virtual PortableServer::RefCountServantBase
                                                              , public virtual POA_CosNotifyFilter::FilterFactory
-                                                             , public TAO_NS_FilterFactory
+                                                             , public TAO_Notify_FilterFactory
 {
 public:
   /// Constuctor
-  TAO_NS_RT_Test_FilterFactory (void);
+  TAO_Notify_Tests_RT_Test_FilterFactory (void);
 
   /// Destructor
-  ~TAO_NS_RT_Test_FilterFactory ();
+  ~TAO_Notify_Tests_RT_Test_FilterFactory ();
 
-  ///= TAO_NS_FilterFactory methods.
+  ///= TAO_Notify_Tests_FilterFactory methods.
 
   virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL);
 
@@ -78,7 +78,7 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-ACE_FACTORY_DECLARE (TAO_RT_Test_Filter, TAO_NS_RT_Test_FilterFactory)
+ACE_FACTORY_DECLARE (TAO_RT_Test_Filter, TAO_Notify_Tests_RT_Test_FilterFactory)
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_Test_FILTERFACTORY_H */
+#endif /* TAO_Notify_Tests_RT_Test_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
index c172ee1964a..1febbd593e5 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/consumer.conf
@@ -1,15 +1,18 @@
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
+
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
index 84adfec9ca5..b182382c616 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/notify.conf
@@ -1,5 +1,8 @@
-dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_NS_RT_Test_FilterFactory () ""        
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
+
+dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
 
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
index d22cc5295d3..d4376d3b1d5 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
@@ -11,15 +11,18 @@
 ##
 
 ##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object * TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index e58a78768ee..e537680db68 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(lib, TAO_Activation_Manager, "$id$")
 #include "Command_Builder.h"
 #include "Name.h"
 
-TAO_NS_Activation_Manager::TAO_NS_Activation_Manager (void)
+TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager (void)
   : barrier_ (0)
   , active_suppliers_ (0)
   , active_consumers_ (0)
@@ -20,7 +20,7 @@ TAO_NS_Activation_Manager::TAO_NS_Activation_Manager (void)
   LOOKUP_MANAGER->_register (this);
 }
 
-TAO_NS_Activation_Manager::~TAO_NS_Activation_Manager ()
+TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager ()
 {
   delete this->barrier_;
 
@@ -29,7 +29,7 @@ TAO_NS_Activation_Manager::~TAO_NS_Activation_Manager ()
 }
 
 int
-TAO_NS_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name)
+TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name)
 {
   this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_LIB_TEXT("w"));
 
@@ -40,14 +40,14 @@ TAO_NS_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name)
 }
 
 int
-TAO_NS_Activation_Manager::ior_input_file (const ACE_TCHAR *file_name)
+TAO_Notify_Tests_Activation_Manager::ior_input_file (const ACE_TCHAR *file_name)
 {
   this->ior_input_file_ = file_name;
   return 0;
 }
 
 void
-TAO_NS_Activation_Manager::done (TAO_NS_Periodic_Supplier* /*supplier*/)
+TAO_Notify_Tests_Activation_Manager::done (TAO_Notify_Tests_Periodic_Supplier* /*supplier*/)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -58,7 +58,7 @@ TAO_NS_Activation_Manager::done (TAO_NS_Periodic_Supplier* /*supplier*/)
 }
 
 void
-TAO_NS_Activation_Manager::done (TAO_NS_Periodic_Consumer* /*consumer*/)
+TAO_Notify_Tests_Activation_Manager::done (TAO_Notify_Tests_Periodic_Consumer* /*consumer*/)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -69,7 +69,7 @@ TAO_NS_Activation_Manager::done (TAO_NS_Periodic_Consumer* /*consumer*/)
 }
 
 void
-TAO_NS_Activation_Manager::wait_for_completion (void)
+TAO_Notify_Tests_Activation_Manager::wait_for_completion (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -78,19 +78,19 @@ TAO_NS_Activation_Manager::wait_for_completion (void)
 }
 
 int
-TAO_NS_Activation_Manager::supplier_count (void)
+TAO_Notify_Tests_Activation_Manager::supplier_count (void)
 {
   return this->supplier_map_.current_size ();
 }
 
 int
-TAO_NS_Activation_Manager::consumer_count (void)
+TAO_Notify_Tests_Activation_Manager::consumer_count (void)
 {
   return this->consumer_map_.current_size ();
 }
 
 void
-TAO_NS_Activation_Manager::_register (TAO_NS_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -107,7 +107,7 @@ TAO_NS_Activation_Manager::_register (TAO_NS_Periodic_Supplier* supplier, const
 }
 
 void
-TAO_NS_Activation_Manager::_register (TAO_NS_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -124,7 +124,7 @@ TAO_NS_Activation_Manager::_register (TAO_NS_Periodic_Consumer* consumer, const
 }
 
 void
-TAO_NS_Activation_Manager::resolve (TAO_NS_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -135,7 +135,7 @@ TAO_NS_Activation_Manager::resolve (TAO_NS_Periodic_Supplier*& supplier, const c
 }
 
 void
-TAO_NS_Activation_Manager::resolve (TAO_NS_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -146,17 +146,17 @@ TAO_NS_Activation_Manager::resolve (TAO_NS_Periodic_Consumer*& consumer, const c
 }
 
 int
-TAO_NS_Activation_Manager::activate_suppliers (void)
+TAO_Notify_Tests_Activation_Manager::activate_suppliers (void)
 {
-  TAO_NS_PeriodicSupplier_Iterator iter(this->supplier_map_);
+  TAO_Notify_Tests_PeriodicSupplier_Iterator iter(this->supplier_map_);
 
-  TAO_NS_PeriodicSupplier_Entry* entry;
+  TAO_Notify_Tests_PeriodicSupplier_Entry* entry;
 
   // Create the barrier to synch activated auppiers.
   this->barrier_ = new ACE_Barrier (this->supplier_count () + 1);
 
   // For each supplier : activate
-  TAO_NS_Periodic_Supplier* supplier = 0;
+  TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
   for (u_int index = 0; iter.done () == 0; iter.advance (), ++index)
     {
@@ -177,7 +177,7 @@ TAO_NS_Activation_Manager::activate_suppliers (void)
 }
 
 void
-TAO_NS_Activation_Manager::dump_stats (int dump_samples)
+TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
 {
   char hostname[MAXHOSTNAMELEN];
   ACE_OS::hostname (hostname, MAXHOSTNAMELEN);
@@ -186,12 +186,12 @@ TAO_NS_Activation_Manager::dump_stats (int dump_samples)
   char msg[BUFSIZ];
   ACE_OS::sprintf (msg, "# Stats generated on %s\n", hostname);
 
-  TAO_NS_PeriodicSupplier_Iterator sup_iter(this->supplier_map_);
+  TAO_Notify_Tests_PeriodicSupplier_Iterator sup_iter(this->supplier_map_);
 
-  TAO_NS_PeriodicSupplier_Entry* sup_entry;
+  TAO_Notify_Tests_PeriodicSupplier_Entry* sup_entry;
 
   // For each supplier
-  TAO_NS_Periodic_Supplier* supplier = 0;
+  TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
   u_int index = 0;
   for (; sup_iter.done () == 0; sup_iter.advance (), ++index)
@@ -204,11 +204,11 @@ TAO_NS_Activation_Manager::dump_stats (int dump_samples)
     }
 
   // dump consumers
-  TAO_NS_PeriodicConsumer_Iterator cons_iter(this->consumer_map_);
+  TAO_Notify_Tests_PeriodicConsumer_Iterator cons_iter(this->consumer_map_);
 
-  TAO_NS_PeriodicConsumer_Entry* cons_entry;
+  TAO_Notify_Tests_PeriodicConsumer_Entry* cons_entry;
 
-  TAO_NS_Periodic_Consumer* consumer = 0;
+  TAO_Notify_Tests_Periodic_Consumer* consumer = 0;
   for (index = 0; cons_iter.done () == 0; cons_iter.advance (), ++index)
     {
       if (cons_iter.next (cons_entry) != 0)
@@ -220,7 +220,7 @@ TAO_NS_Activation_Manager::dump_stats (int dump_samples)
 }
 
 void
-TAO_NS_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::ServantBase_var servant_var (this);
 
@@ -246,7 +246,7 @@ TAO_NS_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -255,7 +255,7 @@ TAO_NS_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 }
 
 void
-TAO_NS_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -268,7 +268,7 @@ TAO_NS_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb;
   LOOKUP_MANAGER->resolve (orb);
@@ -292,32 +292,32 @@ TAO_NS_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Supplier*>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Consumer*>;
+template class ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*>;
+template class ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*>;
 
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
 
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Supplier*>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Consumer*>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*>
 
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
 
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_Hash<ACE_CString>,ACE_Equal_To<ACE_CString>, ACE_SYNCH_NULL_MUTEX>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 5053b66add7..3d9ec8b0fc4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ACTIVATION_MANAGER_H
-#define TAO_NS_ACTIVATION_MANAGER_H
+#ifndef TAO_Notify_Tests_ACTIVATION_MANAGER_H
+#define TAO_Notify_Tests_ACTIVATION_MANAGER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -29,27 +29,27 @@
 class ACE_Barrier;
 
 /**
- * @class TAO_NS_Activation_Manager
+ * @class TAO_Notify_Tests_Activation_Manager
  *
  * @brief Class to handle Suppliers and Consumers.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Activation_Manager : public TAO_NS_Task_Callback
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_Notify_Tests_Task_Callback
                                                        , public POA_Notify_Test::Activation_Manager
 {
-  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX> TAO_NS_PeriodicSupplier_Map;
-  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX> TAO_NS_PeriodicConsumer_Map;
-  typedef ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX> TAO_NS_PeriodicSupplier_Iterator;
-  typedef ACE_Hash_Map_Iterator<ACE_CString, TAO_NS_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX> TAO_NS_PeriodicConsumer_Iterator;
-  typedef ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Supplier*> TAO_NS_PeriodicSupplier_Entry;
-  typedef ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Periodic_Consumer*> TAO_NS_PeriodicConsumer_Entry;
+  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX> TAO_Notify_Tests_PeriodicSupplier_Map;
+  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX> TAO_Notify_Tests_PeriodicConsumer_Map;
+  typedef ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*, ACE_SYNCH_NULL_MUTEX> TAO_Notify_Tests_PeriodicSupplier_Iterator;
+  typedef ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*, ACE_SYNCH_NULL_MUTEX> TAO_Notify_Tests_PeriodicConsumer_Iterator;
+  typedef ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Supplier*> TAO_Notify_Tests_PeriodicSupplier_Entry;
+  typedef ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*> TAO_Notify_Tests_PeriodicConsumer_Entry;
 
 public:
   /// Constuctor
-  TAO_NS_Activation_Manager (void);
+  TAO_Notify_Tests_Activation_Manager (void);
 
   /// Destructor
-  virtual ~TAO_NS_Activation_Manager ();
+  virtual ~TAO_Notify_Tests_Activation_Manager ();
 
   /// Interface impl.
   virtual void start (ACE_ENV_SINGLE_ARG_DECL)
@@ -58,15 +58,15 @@ public:
                      ));
 
   /// Register Supplier
-  void _register (TAO_NS_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL);
   /// Register Consumer
-  void _register (TAO_NS_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL);
 
   /// Resolve Supplier
-  void resolve (TAO_NS_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL);
 
   /// Resolve Consumer
-  void resolve (TAO_NS_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL);
 
   // Activate the tasks for each supplier.
   int activate_suppliers (void);
@@ -80,9 +80,9 @@ public:
   /// Wait till active suppliers and consumers are done.
   void wait_for_completion (void);
 
-  /// TAO_NS_Task_Callback methods
-  virtual void done (TAO_NS_Periodic_Supplier* supplier);
-  virtual void done (TAO_NS_Periodic_Consumer* consumer);
+  /// TAO_Notify_Tests_Task_Callback methods
+  virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier);
+  virtual void done (TAO_Notify_Tests_Periodic_Consumer* consumer);
 
   // Dump stats gathered during exec..
   void dump_stats (int dump_samples);
@@ -114,10 +114,10 @@ protected:
   TAO_SYNCH_CONDITION active_done_;
 
   // Map that stores suppliers.
-  TAO_NS_PeriodicSupplier_Map supplier_map_;
+  TAO_Notify_Tests_PeriodicSupplier_Map supplier_map_;
 
   // Map that stores consumers.
-  TAO_NS_PeriodicConsumer_Map consumer_map_;
+  TAO_Notify_Tests_PeriodicConsumer_Map consumer_map_;
 
   /// The file for output
   FILE *ior_output_file_;
@@ -133,4 +133,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_ACTIVATION_MANAGER_H */
+#endif /* TAO_Notify_Tests_ACTIVATION_MANAGER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index a3d8133af06..e03433c2d9e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -11,29 +11,29 @@ ACE_RCSID(lib, TAO_Application_Command, "$id$")
 #include "Driver_Base.h"
 #include "Priority_Mapping.h"
 
-TAO_NS_Application_Command::TAO_NS_Application_Command (void)
+TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void)
   : dump_samples_ (0)
 {
 }
 
-TAO_NS_Application_Command::~TAO_NS_Application_Command ()
+TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command ()
 {
 }
 
 const char*
-TAO_NS_Application_Command::get_name (void)
+TAO_Notify_Tests_Application_Command::get_name (void)
 {
-  return TAO_NS_Application_Command::name ();
+  return TAO_Notify_Tests_Application_Command::name ();
 }
 
 const char*
-TAO_NS_Application_Command::name (void)
+TAO_Notify_Tests_Application_Command::name (void)
 {
-  return TAO_NS_Name::application_command;
+  return TAO_Notify_Tests_Name::application_command;
 }
 
 void
-TAO_NS_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -92,7 +92,7 @@ TAO_NS_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
 {
   /// Fetch the root poa.
   PortableServer::POA_var root_poa;
@@ -106,28 +106,28 @@ TAO_NS_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
   /// Activate the root POA.
   poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  TAO_NS_Priority_Mapping* mapping = new TAO_NS_Priority_Mapping ();
+  TAO_Notify_Tests_Priority_Mapping* mapping = new TAO_Notify_Tests_Priority_Mapping ();
 
   LOOKUP_MANAGER->_register (mapping);
 }
 
 void
-TAO_NS_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n"));
 
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   act_mgr->wait_for_completion ();
 }
 
 void
-TAO_NS_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n"));
 
-  TAO_NS_Driver_Base* driver = 0;
+  TAO_Notify_Tests_Driver_Base* driver = 0;
   LOOKUP_MANAGER->resolve (driver);
 
   driver->shutdown ();
@@ -135,24 +135,24 @@ TAO_NS_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n"));
 
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   act_mgr->dump_stats (this->dump_samples_);
 }
 
 void
-TAO_NS_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Run the Consumers
 
 
   //= Run the Suppliers
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   if (act_mgr->activate_suppliers () == 0)
@@ -162,18 +162,18 @@ TAO_NS_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_Application_Command::handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   act_mgr->signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   act_mgr->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -183,7 +183,7 @@ TAO_NS_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == INIT)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index 1bf92722e81..5a4b8d059fd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_APPLICATION_COMMAND_H
-#define TAO_NS_APPLICATION_COMMAND_H
+#ifndef TAO_Notify_Tests_APPLICATION_COMMAND_H
+#define TAO_Notify_Tests_APPLICATION_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,22 +22,22 @@
 #include "tao/ORB.h"
 #include "Command.h"
 
-class TAO_NS_Application_Command;
+class TAO_Notify_Tests_Application_Command;
 
 /**
- * @class TAO_NS_Application_Command
+ * @class TAO_Notify_Tests_Application_Command
  *
  * @brief Command to control the Application.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Application_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_Application_Command (void);
+  TAO_Notify_Tests_Application_Command (void);
 
   /// Destructor
-  ~TAO_NS_Application_Command ();
+  ~TAO_Notify_Tests_Application_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -80,4 +80,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_APPLICATION_COMMAND_H */
+#endif /* TAO_Notify_Tests_APPLICATION_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index b14d86d5774..45b809430fd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -7,29 +7,29 @@
 
 ACE_RCSID(lib, TAO_Command, "$id$")
 
-TAO_NS_Command::TAO_NS_Command (void)
+TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void)
   :next_ (0), command_ (INVALID)
 {
 }
 
-TAO_NS_Command::~TAO_NS_Command ()
+TAO_Notify_Tests_Command::~TAO_Notify_Tests_Command ()
 {
 }
 
 void
-TAO_NS_Command::init (ACE_Arg_Shifter& /*arg_shifter*/)
+TAO_Notify_Tests_Command::init (ACE_Arg_Shifter& /*arg_shifter*/)
 {
   // default: do nothing.
 }
 
 void
-TAO_NS_Command::next (TAO_NS_Command* command)
+TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command)
 {
   this->next_ = command;
 }
 
 void
-TAO_NS_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == INVALID)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 559aabc9a43..7bed8e63a74 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COMMAND_H
-#define TAO_NS_COMMAND_H
+#ifndef TAO_Notify_Tests_COMMAND_H
+#define TAO_Notify_Tests_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,20 +24,20 @@
 #include "ace/CORBA_macros.h"
 
 /**
- * @class TAO_NS_Command
+ * @class TAO_Notify_Tests_Command
  *
  * @brief Base Class for all command objects.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command
 {
-  friend class TAO_NS_Command_Builder;
+  friend class TAO_Notify_Tests_Command_Builder;
 public:
   /// Constuctor
-  TAO_NS_Command (void);
+  TAO_Notify_Tests_Command (void);
 
   /// Destructor
-  virtual ~TAO_NS_Command ();
+  virtual ~TAO_Notify_Tests_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -53,7 +53,7 @@ public:
 
 protected:
   /// Next command after this one.
-  TAO_NS_Command* next_;
+  TAO_Notify_Tests_Command* next_;
 
   enum {INVALID = -1};
 
@@ -64,8 +64,8 @@ private:
   void execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Save the next command to exec.
-  void next (TAO_NS_Command* command);
+  void next (TAO_Notify_Tests_Command* command);
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_COMMAND_H */
+#endif /* TAO_Notify_Tests_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index 73330daa94b..d2870bd9530 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -9,22 +9,22 @@
 
 ACE_RCSID(lib, TAO_Command_Builder, "$id$")
 
-TAO_NS_Command_Builder::TAO_NS_Command_Builder (void)
+TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void)
   :start_command_ (0)
 {
 }
 
-TAO_NS_Command_Builder::~TAO_NS_Command_Builder ()
+TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder ()
 {
 }
 
 int
-TAO_NS_Command_Builder::init (int argc, char *argv[])
+TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
   ACE_CString current_arg;
-  TAO_NS_Command_Factory* factory = 0;
+  TAO_Notify_Tests_Command_Factory* factory = 0;
 
   if (arg_shifter.is_anything_left ())
     {
@@ -37,7 +37,7 @@ TAO_NS_Command_Builder::init (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG, "NS Command: %s not recognized!\n", current_arg.c_str ()));
       else
         {
-          TAO_NS_Command* new_command = factory->create ();
+          TAO_Notify_Tests_Command* new_command = factory->create ();
 
           new_command->init (arg_shifter);
 
@@ -59,13 +59,13 @@ TAO_NS_Command_Builder::init (int argc, char *argv[])
 }
 
 int
-TAO_NS_Command_Builder::fini (void)
+TAO_Notify_Tests_Command_Builder::fini (void)
 {
         return 0;
 }
 
 void
-TAO_NS_Command_Builder::_register (ACE_CString command_factory_name, TAO_NS_Command_Factory* command_factory)
+TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory)
 {
   if (this->factory_map_.bind (command_factory_name, command_factory) == -1)
     ACE_DEBUG ((LM_DEBUG, "Failed to register command factory for %s\n", command_factory_name.c_str ()));
@@ -74,35 +74,35 @@ TAO_NS_Command_Builder::_register (ACE_CString command_factory_name, TAO_NS_Comm
 }
 
 void
-TAO_NS_Command_Builder::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command_Builder::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->start_command_)
     this->start_command_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-ACE_STATIC_SVC_DEFINE(TAO_NS_Command_Builder,
-                      TAO_NS_Name::command_builder,
+ACE_STATIC_SVC_DEFINE(TAO_Notify_Tests_Command_Builder,
+                      TAO_Notify_Tests_Name::command_builder,
                       ACE_SVC_OBJ_T,
-                      &ACE_SVC_NAME (TAO_NS_Command_Builder),
+                      &ACE_SVC_NAME (TAO_Notify_Tests_Command_Builder),
                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                       0)
 
-ACE_FACTORY_DEFINE (TAO_NOTIFY_TEST, TAO_NS_Command_Builder)
+ACE_FACTORY_DEFINE (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder)
 
-ACE_STATIC_SVC_REQUIRE (TAO_NS_Command_Builder)
+ACE_STATIC_SVC_REQUIRE (TAO_Notify_Tests_Command_Builder)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Hash_Map_Manager <ACE_CString, TAO_NS_Command_Factory*, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Command_Factory *>;
+template class ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Command_Factory *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Manager <ACE_CString, TAO_NS_Command_Factory*, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_NS_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_NS_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_NS_Command_Factory *>
+#pragma instantiate ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Tests_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Tests_Command_Factory *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Command_Factory *>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index f0c4ef66c86..b994753d5ad 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COMMAND_BUILDER_H
-#define TAO_NS_COMMAND_BUILDER_H
+#ifndef TAO_Notify_Tests_COMMAND_BUILDER_H
+#define TAO_Notify_Tests_COMMAND_BUILDER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -27,48 +27,48 @@
 #include "ace/Hash_Map_Manager.h"
 #include "tao/ORB.h"
 
-class TAO_NS_Command_Factory;
-class TAO_NS_Command;
+class TAO_Notify_Tests_Command_Factory;
+class TAO_Notify_Tests_Command;
 
 /**
- * @class TAO_NS_Command_Builder
+ * @class TAO_Notify_Tests_Command_Builder
  *
  * @brief Class for collating and serially executing command objects.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Command_Builder : public ACE_Service_Object
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Builder : public ACE_Service_Object
 {
 public:
   /// Constuctor
-  TAO_NS_Command_Builder (void);
+  TAO_Notify_Tests_Command_Builder (void);
 
   /// Destructor
-  ~TAO_NS_Command_Builder ();
+  ~TAO_Notify_Tests_Command_Builder ();
 
   /// = Service_Object virtual method overloads.
   virtual int init (int argc, char *argv[]);
   virtual int fini (void);
 
   /// Register the factory against the name of the factory.
-  void _register (ACE_CString command_factory_name, TAO_NS_Command_Factory* command_factory);
+  void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory);
 
   /// Execute the <start_command_>.
   void execute (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// The starting command. each command executes the next one when done.
-  TAO_NS_Command* start_command_;
+  TAO_Notify_Tests_Command* start_command_;
 
   /// Last command initialized.
-  TAO_NS_Command* last_command_;
+  TAO_Notify_Tests_Command* last_command_;
 
   /// The factory map.
-  ACE_Hash_Map_Manager <ACE_CString, TAO_NS_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_;
+  ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_;
 };
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_NS_Command_Builder)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder)
 
-ACE_FACTORY_DECLARE (TAO_NOTIFY_TEST, TAO_NS_Command_Builder)
+ACE_FACTORY_DECLARE (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder)
 
 #include "ace/post.h"
-#endif /* TAO_NS_COMMAND_BUILDER_H */
+#endif /* TAO_Notify_Tests_COMMAND_BUILDER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index b103b37e78e..51c97d29e1e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -5,10 +5,10 @@
 
 ACE_RCSID(lib, TAO_Command_Factory, "$id$")
 
-TAO_NS_Command_Factory::TAO_NS_Command_Factory (void)
+TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void)
 {
 }
 
-TAO_NS_Command_Factory::~TAO_NS_Command_Factory ()
+TAO_Notify_Tests_Command_Factory::~TAO_Notify_Tests_Command_Factory ()
 {
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
index 1646b0e2f21..5f2b2b106c8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_COMMAND_FACTORY_H
-#define TAO_NS_COMMAND_FACTORY_H
+#ifndef TAO_Notify_Tests_COMMAND_FACTORY_H
+#define TAO_Notify_Tests_COMMAND_FACTORY_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -19,26 +19,26 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_NS_Command;
+class TAO_Notify_Tests_Command;
 
 /**
- * @class TAO_NS_Command_Factory
+ * @class TAO_Notify_Tests_Command_Factory
  *
  * @brief Base class for Factory to create command objects.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Command_Factory
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory
 {
 public:
   /// Constuctor
-  TAO_NS_Command_Factory (void);
+  TAO_Notify_Tests_Command_Factory (void);
 
   /// Destructor
-  virtual ~TAO_NS_Command_Factory ();
+  virtual ~TAO_Notify_Tests_Command_Factory ();
 
   /// Create the command.
-  virtual TAO_NS_Command* create (void) = 0;
+  virtual TAO_Notify_Tests_Command* create (void) = 0;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_COMMAND_FACTORY_H */
+#endif /* TAO_Notify_Tests_COMMAND_FACTORY_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index ac27df4d2d5..75dca19dcc3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_NS_COMMAND_FACTORY_T_CPP
-#define TAO_NS_COMMAND_FACTORY_T_CPP
+#ifndef TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
+#define TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
 
 #include "Command_Factory_T.h"
 
@@ -13,23 +13,23 @@ ACE_RCSID(Notify, TAO_Command_Factory_T, "$id$")
 #include "Name.h"
 
 template <class COMMAND>
-TAO_NS_Command_Factory_T<COMMAND>::TAO_NS_Command_Factory_T (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T (void)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG, "Creating command factory for %s\n", COMMAND::name()));
 }
 
 template <class COMMAND>
-TAO_NS_Command_Factory_T<COMMAND>::~TAO_NS_Command_Factory_T ()
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::~TAO_Notify_Tests_Command_Factory_T ()
 {
 }
 
 template <class COMMAND> int
-TAO_NS_Command_Factory_T<COMMAND>::init (int /*argc*/, char/*argv*/ *[])
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::init (int /*argc*/, char/*argv*/ *[])
 {
   /// register with Command builder
-  TAO_NS_Command_Builder* cmd_builder =
-    ACE_Dynamic_Service<TAO_NS_Command_Builder>::instance (TAO_NS_Name::command_builder);
+  TAO_Notify_Tests_Command_Builder* cmd_builder =
+    ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder);
 
   if (cmd_builder)
     cmd_builder->_register (COMMAND::name(), this);
@@ -39,15 +39,15 @@ TAO_NS_Command_Factory_T<COMMAND>::init (int /*argc*/, char/*argv*/ *[])
 }
 
 template <class COMMAND> int
-TAO_NS_Command_Factory_T<COMMAND>::fini (void)
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini (void)
 {
   return 0;
 }
 
-template <class COMMAND> TAO_NS_Command*
-TAO_NS_Command_Factory_T<COMMAND>::create (void)
+template <class COMMAND> TAO_Notify_Tests_Command*
+TAO_Notify_Tests_Command_Factory_T<COMMAND>::create (void)
 {
   return new COMMAND ();
 }
 
-#endif /* TAO_NS_COMMAND_FACTORY_T_CPP */
+#endif /* TAO_Notify_Tests_COMMAND_FACTORY_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index 7d46a55bf5e..13be6d6b9af 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -23,7 +23,7 @@
 #include "ace/Service_Object.h"
 #include "Command_Factory.h"
 
-class TAO_NS_Command;
+class TAO_Notify_Tests_Command;
 
 /**
  * @class TAO_Command_Factory_T
@@ -36,21 +36,21 @@ class TAO_NS_Command;
 #undef COMMAND
 #endif
 template <class COMMAND>
-class TAO_NOTIFY_TEST_Export TAO_NS_Command_Factory_T : public TAO_NS_Command_Factory, public ACE_Service_Object
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object
 {
 public:
   /// Constuctor
-  TAO_NS_Command_Factory_T (void);
+  TAO_Notify_Tests_Command_Factory_T (void);
 
   /// Destructor
-  ~TAO_NS_Command_Factory_T ();
+  ~TAO_Notify_Tests_Command_Factory_T ();
 
   /// = Service_Object virtual method overloads.
   virtual int init (int argc, char *argv[]);
   virtual int fini (void);
 
   /// Create the <COMMAND> command.
-  TAO_NS_Command* create (void);
+  TAO_Notify_Tests_Command* create (void);
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index f919e7fcd34..05f4946f3be 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -8,29 +8,29 @@ ACE_RCSID(lib, TAO_ConsumerAdmin_Command, "$id$")
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_NS_ConsumerAdmin_Command::TAO_NS_ConsumerAdmin_Command (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command (void)
   :ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
 
-TAO_NS_ConsumerAdmin_Command::~TAO_NS_ConsumerAdmin_Command ()
+TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command ()
 {
 }
 
 const char*
-TAO_NS_ConsumerAdmin_Command::get_name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void)
 {
-  return TAO_NS_ConsumerAdmin_Command::name ();
+  return TAO_Notify_Tests_ConsumerAdmin_Command::name ();
 }
 
 const char*
-TAO_NS_ConsumerAdmin_Command::name (void)
+TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
 {
-  return TAO_NS_Name::consumer_admin_command;
+  return TAO_Notify_Tests_Name::consumer_admin_command;
 }
 
 void
-TAO_NS_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -50,7 +50,7 @@ TAO_NS_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_NS_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -78,7 +78,7 @@ TAO_NS_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
@@ -90,13 +90,13 @@ TAO_NS_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   //@@ TODO:
 }
 
 void
-TAO_NS_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -135,7 +135,7 @@ TAO_NS_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser options_parser;
+          TAO_Notify_Tests_Options_Parser options_parser;
           options_parser.execute (this->added_, this->removed_, arg_shifter);
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS admin_name [Qos Options]
@@ -148,14 +148,14 @@ TAO_NS_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     }
 }
 
 void
-TAO_NS_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index bf6162d47ae..b75d62688dd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMERADMIN_COMMAND_H
-#define TAO_NS_CONSUMERADMIN_COMMAND_H
+#ifndef TAO_Notify_Tests_CONSUMERADMIN_COMMAND_H
+#define TAO_Notify_Tests_CONSUMERADMIN_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,19 +24,19 @@
 #include "Command.h"
 
 /**
- * @class TAO_NS_ConsumerAdmin_Command
+ * @class TAO_Notify_Tests_ConsumerAdmin_Command
  *
  * @brief Command for ConsumerAdmin objects.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_ConsumerAdmin_Command  : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command  : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_ConsumerAdmin_Command (void);
+  TAO_Notify_Tests_ConsumerAdmin_Command (void);
 
   /// Destructor
-  ~TAO_NS_ConsumerAdmin_Command ();
+  ~TAO_Notify_Tests_ConsumerAdmin_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -87,4 +87,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMERADMIN_COMMAND_H */
+#endif /* TAO_Notify_Tests_CONSUMERADMIN_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index c5c0f022844..cdf8482ba18 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Consumer_T_CPP
-#define TAO_NS_Consumer_T_CPP
+#ifndef TAO_Notify_Tests_Consumer_T_CPP
+#define TAO_Notify_Tests_Consumer_T_CPP
 
 #include "Consumer_T.h"
 
@@ -8,26 +8,26 @@
 #include "Consumer_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Consumer_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$id$")
 
 template <class Consumer_Traits>
-TAO_NS_Consumer_T<Consumer_Traits>::TAO_NS_Consumer_T (void)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void)
 {
 }
 
 template <class Consumer_Traits>
-TAO_NS_Consumer_T<Consumer_Traits>::~TAO_NS_Consumer_T ()
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::~TAO_Notify_Tests_Consumer_T ()
 {
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_NS_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
+template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
 {
   return this->get_proxy ();
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
 {
   Consumer_Traits traits;
 
@@ -45,8 +45,8 @@ TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Consumer_T
   ACE_ENV_ARG_PARAMETER);
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
+template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
                                              , CosNotification::QoSProperties& qos
                                              ACE_ENV_ARG_DECL)
 {
@@ -67,7 +67,7 @@ TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Consumer_T
 }
 
 template <class Consumer_Traits> void
-TAO_NS_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
@@ -98,7 +98,7 @@ TAO_NS_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventT
 }
 
 template <class Consumer_Traits> void
-TAO_NS_Consumer_T<Consumer_Traits>::offer_change
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
     ACE_ENV_ARG_DECL_NOT_USED)
@@ -108,4 +108,4 @@ TAO_NS_Consumer_T<Consumer_Traits>::offer_change
   // No-Op.
 }
 
-#endif /* TAO_NS_Consumer_T_CPP */
+#endif /* TAO_Notify_Tests_Consumer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 9f5667a35de..ea9e25f8df8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_T_H
-#define TAO_NS_CONSUMER_T_H
+#ifndef TAO_Notify_Tests_CONSUMER_T_H
+#define TAO_Notify_Tests_CONSUMER_T_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -21,7 +21,7 @@
 
 #include "Peer_T.h"
 
-class TAO_NS_ConsumerAdmin_Traits
+class TAO_Notify_Tests_ConsumerAdmin_Traits
 {
  public:
   typedef CosNotifyChannelAdmin::ConsumerAdmin INTERFACE;
@@ -29,7 +29,7 @@ class TAO_NS_ConsumerAdmin_Traits
   typedef CosNotifyChannelAdmin::ConsumerAdmin_var VAR;
 };
 
-class TAO_NS_ConsumerAdmin_Ext_Traits
+class TAO_Notify_Tests_ConsumerAdmin_Ext_Traits
 {
  public:
   typedef NotifyExt::ConsumerAdmin INTERFACE;
@@ -38,13 +38,13 @@ class TAO_NS_ConsumerAdmin_Ext_Traits
 };
 
 /**
- * @class TAO_NS_Consumer_T
+ * @class TAO_Notify_Tests_Consumer_T
  *
  * @brief Base template to implement Consumers.
  *
  */
 template <class Consumer_Traits>
-class TAO_NOTIFY_TEST_Export TAO_NS_Consumer_T : public TAO_NS_Peer_T <Consumer_Traits>
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Traits>
 {
   typedef ACE_TYPENAME Consumer_Traits::Admin_Traits Admin_Traits;
   typedef ACE_TYPENAME Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
@@ -57,10 +57,10 @@ class TAO_NOTIFY_TEST_Export TAO_NS_Consumer_T : public TAO_NS_Peer_T <Consumer_
 
 public:
   /// Constuctor
-  TAO_NS_Consumer_T (void);
+  TAO_Notify_Tests_Consumer_T (void);
 
   /// Destructor
-  ~TAO_NS_Consumer_T ();
+  ~TAO_Notify_Tests_Consumer_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
   Proxy_Traits_PTR get_proxy_supplier (void);
@@ -101,4 +101,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_T_H */
+#endif /* TAO_Notify_Tests_CONSUMER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 90e7d3022bc..fa99737c9ac 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -6,18 +6,18 @@ ACE_RCSID(lib, TAO_Direct_Consumer, "$id$")
 
 #include "LookupManager.h"
 
-TAO_NS_Direct_Consumer::TAO_NS_Direct_Consumer (void)
+TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void)
 {
 }
 
-TAO_NS_Direct_Consumer::~TAO_NS_Direct_Consumer ()
+TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
 {
 }
 
 void
-TAO_NS_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "TAO_NS_Direct_Consumer::connect resolving poa %s\n",
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_Direct_Consumer::connect resolving poa %s\n",
               this->poa_name_.c_str ()));
   // Get the POA
   PortableServer::POA_var poa;
@@ -28,7 +28,7 @@ TAO_NS_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
   this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, "TAO_NS_Direct_Consumer::connect - _this\n"));
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_Direct_Consumer::connect - _this\n"));
 
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index 38e486dea6d..ec9120835a9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_DIRECT_CONSUMER_H
-#define TAO_NS_DIRECT_CONSUMER_H
+#ifndef TAO_Notify_Tests_DIRECT_CONSUMER_H
+#define TAO_Notify_Tests_DIRECT_CONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,23 +22,23 @@
 #include "Periodic_Consumer.h"
 
 /**
- * @class TAO_NS_Direct_Consumer
+ * @class TAO_Notify_Tests_Direct_Consumer
  *
  * @brief Does not connect to the Notification Service. The Direct Supplier supplies events directly.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Direct_Consumer : public TAO_NS_Periodic_Consumer
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notify_Tests_Periodic_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_Direct_Consumer (void);
+  TAO_Notify_Tests_Direct_Consumer (void);
 
   /// Destructor
-  ~TAO_NS_Direct_Consumer ();
+  ~TAO_Notify_Tests_Direct_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
   virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_DIRECT_CONSUMER_H */
+#endif /* TAO_Notify_Tests_DIRECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index af7cf9fa69a..3a2a83c132d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -6,21 +6,21 @@
 #include "Direct_Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Direct_Supplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Tests_Direct_Supplier, "$id$")
 
 #include "LookupManager.h"
 
-TAO_NS_Direct_Supplier::TAO_NS_Direct_Supplier (ACE_CString& target)
+TAO_Notify_Tests_Direct_Supplier::TAO_Notify_Tests_Direct_Supplier (ACE_CString& target)
   : target_ (target)
 {
 }
 
-TAO_NS_Direct_Supplier::~TAO_NS_Direct_Supplier ()
+TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier ()
 {
 }
 
 void
-TAO_NS_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the POA
   PortableServer::POA_var poa;
@@ -46,7 +46,7 @@ TAO_NS_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event
+TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event
                                    ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ()));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index cf913471ff1..c7e58401c07 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_DIRECT_SUPPLIER_H
-#define TAO_NS_DIRECT_SUPPLIER_H
+#ifndef TAO_Notify_Tests_DIRECT_SUPPLIER_H
+#define TAO_Notify_Tests_DIRECT_SUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,19 +22,19 @@
 #include "Periodic_Supplier.h"
 
 /**
- * @class TAO_NS_Direct_Supplier
+ * @class TAO_Notify_Tests_Direct_Supplier
  *
  * @brief Send Directly to a consumer.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Direct_Supplier : public TAO_NS_Periodic_Supplier
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Supplier : public TAO_Notify_Tests_Periodic_Supplier
 {
 public:
   /// Constuctor
-  TAO_NS_Direct_Supplier (ACE_CString& target);
+  TAO_Notify_Tests_Direct_Supplier (ACE_CString& target);
 
   /// Destructor
-  ~TAO_NS_Direct_Supplier ();
+  ~TAO_Notify_Tests_Direct_Supplier ();
 
   /// Connect using options parsed and set initial QoS.
   virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
@@ -56,4 +56,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_DIRECT_SUPPLIER_H */
+#endif /* TAO_Notify_Tests_DIRECT_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index a311a480f9e..07c66171a53 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -16,19 +16,65 @@ ACE_RCSID(lib, TAO_Driver, "$id$")
 #include "Name.h"
 #include "Activation_Manager.h"
 
+const char *
+sched_policy_name (int sched_policy)
+{
+  const char *name = 0;
+
+  switch (sched_policy)
+    {
+    case ACE_SCHED_OTHER:
+      name = "SCHED_OTHER";
+      break;
+    case ACE_SCHED_RR:
+      name = "SCHED_RR";
+      break;
+    case ACE_SCHED_FIFO:
+      name = "SCHED_FIFO";
+      break;
+    }
+
+  return name;
+}
+
+void
+check_supported_priorities (CORBA::ORB_ptr orb)
+{
+  int sched_policy =
+    orb->orb_core ()->orb_params ()->ace_sched_policy ();
+
+  // Check that we have sufficient priority range to run this test,
+  // i.e., more than 1 priority level.
+  int max_priority =
+    ACE_Sched_Params::priority_max (sched_policy);
+  int min_priority =
+    ACE_Sched_Params::priority_min (sched_policy);
+
+  if (max_priority == min_priority)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Not enough priority levels with the %s scheduling policy\n"
+                  "on this platform to run the test, terminating program....\n"
+                  "Check svc.conf options\n",
+                  sched_policy_name (sched_policy)));
+
+      ACE_OS::exit (2);
+    }
+}
+
 /*****************************************************************/
-TAO_NS_Worker::TAO_NS_Worker (void)
+TAO_Notify_Tests_Worker::TAO_Notify_Tests_Worker (void)
 {
 }
 
 void
-TAO_NS_Worker::command_builder (TAO_NS_Command_Builder* cmd_builder)
+TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_builder)
 {
   this->cmd_builder_ = cmd_builder;
 }
 
 int
-TAO_NS_Worker::svc (void)
+TAO_Notify_Tests_Worker::svc (void)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -64,24 +110,24 @@ TAO_NS_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_NS_ORB_Run_Worker::TAO_NS_ORB_Run_Worker (void)
+TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker (void)
 {
 }
 
 void
-TAO_NS_ORB_Run_Worker::orb (CORBA::ORB_ptr orb)
+TAO_Notify_Tests_ORB_Run_Worker::orb (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 }
 
 void
-TAO_NS_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
+TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
 {
   this->run_period_ = run_period;
 }
 
 int
-TAO_NS_ORB_Run_Worker::svc (void)
+TAO_Notify_Tests_ORB_Run_Worker::svc (void)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -114,22 +160,22 @@ TAO_NS_ORB_Run_Worker::svc (void)
 
 /*****************************************************************/
 
-TAO_NS_Driver::TAO_NS_Driver (void)
+TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver (void)
   :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0)
 {
-  this->activation_manager_ = new TAO_NS_Activation_Manager ();
+  this->activation_manager_ = new TAO_Notify_Tests_Activation_Manager ();
   LOOKUP_MANAGER->_register (this->activation_manager_);
 
   LOOKUP_MANAGER->_register (this);
 }
 
-TAO_NS_Driver::~TAO_NS_Driver ()
+TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver ()
 {
   delete this->activation_manager_;
 }
 
 int
-TAO_NS_Driver::parse_args (int argc, char *argv[])
+TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -174,7 +220,7 @@ TAO_NS_Driver::parse_args (int argc, char *argv[])
 }
 
 int
-TAO_NS_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 {
   ACE_Argv_Type_Converter command_line(argc, argv);
 
@@ -187,11 +233,15 @@ TAO_NS_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities (this->orb_.in());
+
   LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->cmd_builder_ =
-    ACE_Dynamic_Service<TAO_NS_Command_Builder>::instance (TAO_NS_Name::command_builder);
+    ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder);
 
   worker_.command_builder (this->cmd_builder_);
 
@@ -206,7 +256,7 @@ TAO_NS_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Task activation flags.
   long flags =
@@ -253,7 +303,7 @@ TAO_NS_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_Driver::shutdown (void)
+TAO_Notify_Tests_Driver::shutdown (void)
 {
   this->orb_->shutdown ();
 }
@@ -261,10 +311,10 @@ TAO_NS_Driver::shutdown (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Dynamic_Service<TAO_NS_Command_Builder>;
+template class ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Dynamic_Service<TAO_NS_Command_Builder>
+#pragma instantiate ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index fe8dbc67a5a..64f004fd874 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_DRIVER_H
-#define TAO_NS_DRIVER_H
+#ifndef TAO_Notify_Tests_DRIVER_H
+#define TAO_Notify_Tests_DRIVER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,16 +24,16 @@
 #include "tao/corba.h"
 #include "Driver_Base.h"
 
-class TAO_NS_Command_Builder;
-class TAO_NS_Activation_Manager;
+class TAO_Notify_Tests_Command_Builder;
+class TAO_Notify_Tests_Activation_Manager;
 
 /**
- * @class TAO_NS_Worker
+ * @class TAO_Notify_Tests_Worker
  *
  * @brief A Task to execute commands asynchronously.
  *
  */
-class TAO_NS_Worker : public ACE_Task_Base
+class TAO_Notify_Tests_Worker : public ACE_Task_Base
 {
   // = TITLE
   //   Run a server thread
@@ -42,11 +42,11 @@ class TAO_NS_Worker : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run server threads
   //
 public:
-  TAO_NS_Worker (void);
+  TAO_Notify_Tests_Worker (void);
   // ctor
 
   /// Set the command builder.
-  void command_builder (TAO_NS_Command_Builder* cmd_builder);
+  void command_builder (TAO_Notify_Tests_Command_Builder* cmd_builder);
 
   virtual int svc (void);
   // The thread entry point.
@@ -55,12 +55,12 @@ public:
 
 private:
   /// The command builder
-  TAO_NS_Command_Builder* cmd_builder_;
+  TAO_Notify_Tests_Command_Builder* cmd_builder_;
 };
 
 
 
-class TAO_NS_ORB_Run_Worker : public ACE_Task_Base
+class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base
 {
   // = TITLE
   //   Run a server thread
@@ -69,7 +69,7 @@ class TAO_NS_ORB_Run_Worker : public ACE_Task_Base
   //   Use the ACE_Task_Base class to run server threads
   //
 public:
-  TAO_NS_ORB_Run_Worker (void);
+  TAO_Notify_Tests_ORB_Run_Worker (void);
   // ctor
 
   void orb (CORBA::ORB_ptr orb);
@@ -90,19 +90,19 @@ private:
 
 
 /**
- * @class TAO_NS_Driver
+ * @class TAO_Notify_Tests_Driver
  *
  * @brief A default Application Starter.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Driver : public TAO_NS_Driver_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_Driver_Base
 {
 public:
   /// Constuctor
-  TAO_NS_Driver (void);
+  TAO_Notify_Tests_Driver (void);
 
   /// Destructor
-  ~TAO_NS_Driver ();
+  ~TAO_Notify_Tests_Driver ();
 
   /// Init
   int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
@@ -118,16 +118,16 @@ protected:
   int parse_args (int argc, char *argv[]);
 
   /// The command builder
-  TAO_NS_Command_Builder* cmd_builder_;
+  TAO_Notify_Tests_Command_Builder* cmd_builder_;
 
   /// Manage activation of periodic suppliers and consumers.
-  TAO_NS_Activation_Manager* activation_manager_;
+  TAO_Notify_Tests_Activation_Manager* activation_manager_;
 
   /// Thread in which to run commands.
-  TAO_NS_Worker worker_;
+  TAO_Notify_Tests_Worker worker_;
 
   /// Thread in which to run the orb.
-  TAO_NS_ORB_Run_Worker orb_run_worker_;
+  TAO_Notify_Tests_ORB_Run_Worker orb_run_worker_;
 
   /// The ORB we run.
   CORBA::ORB_var orb_;
@@ -143,4 +143,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_DRIVER_H */
+#endif /* TAO_Notify_Tests_DRIVER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
index b49d95a7056..f2af9612309 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_APPLICATION_STARTER_H
-#define TAO_NS_APPLICATION_STARTER_H
+#ifndef TAO_Notify_Tests_APPLICATION_STARTER_H
+#define TAO_Notify_Tests_APPLICATION_STARTER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -20,19 +20,19 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
- * @class TAO_NS_Driver_Base
+ * @class TAO_Notify_Tests_Driver_Base
  *
  * @brief Base class for Driver.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Driver_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver_Base
 {
 public:
-  virtual ~TAO_NS_Driver_Base () {};
+  virtual ~TAO_Notify_Tests_Driver_Base () {};
 
   /// Shutdown
   virtual void shutdown (void) = 0;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_APPLICATION_STARTER_H */
+#endif /* TAO_Notify_Tests_APPLICATION_STARTER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index ed167418d38..796c320e280 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -11,29 +11,29 @@ ACE_RCSID(lib, TAO_EventChannel_Command, "$id$")
 #include "ace/Dynamic_Service.h"
 #include "../../../orbsvcs/Notify/Service.h"
 
-TAO_NS_EventChannel_Command::TAO_NS_EventChannel_Command (void)
+TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command (void)
   : collocated_ (0)
 {
 }
 
-TAO_NS_EventChannel_Command::~TAO_NS_EventChannel_Command ()
+TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command ()
 {
 }
 
 const char*
-TAO_NS_EventChannel_Command::get_name (void)
+TAO_Notify_Tests_EventChannel_Command::get_name (void)
 {
-  return TAO_NS_EventChannel_Command::name ();
+  return TAO_Notify_Tests_EventChannel_Command::name ();
 }
 
 const char*
-TAO_NS_EventChannel_Command::name (void)
+TAO_Notify_Tests_EventChannel_Command::name (void)
 {
-  return TAO_NS_Name::event_channel_command;
+  return TAO_Notify_Tests_Name::event_channel_command;
 }
 
 void
-TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -57,7 +57,7 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
           if (arg_shifter.cur_arg_strncasecmp ("COLOCATED") == 0) // grandfather in misspelled
             {
               this->collocated_ = 1;
-              ACE_DEBUG ((LM_WARNING, "TAO_NS_EventChannel_Command::init --"
+              ACE_DEBUG ((LM_WARNING, "TAO_Notify_Tests_EventChannel_Command::init --"
                           " warning: deprecated misspelled COLOCATED option used.\n"));
             }
         }
@@ -81,21 +81,21 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     }
 }
 
 void
-TAO_NS_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
   // The Service Object.
   TAO_Notify_Service* notify_service;
 
-  notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NS_NOTIFICATION_SERVICE_NAME);
+  notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
 
   if (notify_service == 0)
     {
@@ -130,7 +130,7 @@ TAO_NS_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
 
   // Register with the Naming Service
   CosNaming::Name_var name =
-    naming->to_name (TAO_NS_Name::event_channel_factory
+    naming->to_name (TAO_Notify_Tests_Name::event_channel_factory
                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -141,7 +141,7 @@ TAO_NS_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->collocated_ == 1)
     {
@@ -151,7 +151,7 @@ TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 
   CosNotifyChannelAdmin::EventChannelFactory_var ec_factory;
 
-  LOOKUP_MANAGER->resolve (ec_factory , TAO_NS_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties qos;
@@ -170,7 +170,7 @@ TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
   CosNotifyChannelAdmin::EventChannel_var ec;
@@ -182,7 +182,7 @@ TAO_NS_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 void
-TAO_NS_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -194,13 +194,13 @@ TAO_NS_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_EventChannel_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_EventChannel_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   //@@ TODO: Implement
 }
 
 void
-TAO_NS_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 3323f380af6..773babce207 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENTCHANNEL_COMMAND_H
-#define TAO_NS_EVENTCHANNEL_COMMAND_H
+#ifndef TAO_Notify_Tests_EVENTCHANNEL_COMMAND_H
+#define TAO_Notify_Tests_EVENTCHANNEL_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -27,19 +27,19 @@
 class TAO_Notify_Service;
 
 /**
- * @class TAO_NS_EventChannel_Command
+ * @class TAO_Notify_Tests_EventChannel_Command
  *
  * @brief Command object for event channels.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_EventChannel_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_EventChannel_Command (void);
+  TAO_Notify_Tests_EventChannel_Command (void);
 
   /// Destructor
-  virtual ~TAO_NS_EventChannel_Command ();
+  virtual ~TAO_Notify_Tests_EventChannel_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -90,4 +90,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENTCHANNEL_COMMAND_H */
+#endif /* TAO_Notify_Tests_EVENTCHANNEL_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index bf52540e24a..43838c92470 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Factories_Define.h"
 
-ACE_RCSID(lib, TAO_NS_Factories_Define, "$id$")
+ACE_RCSID(lib, TAO_Notify_Tests_Factories_Define, "$id$")
 
 #include "Name.h"
 #include "Command_Factory_T.h"
@@ -14,32 +14,32 @@ ACE_RCSID(lib, TAO_NS_Factories_Define, "$id$")
 #include "Periodic_Consumer_Command.h"
 #include "Filter_Command.h"
 
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_EventChannel_Command,TAO_NS_Name::event_channel_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_Application_Command,TAO_NS_Name::application_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_SupplierAdmin_Command,TAO_NS_Name::supplier_admin_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_ConsumerAdmin_Command,TAO_NS_Name::consumer_admin_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_Periodic_Supplier_Command,TAO_NS_Name::periodic_supplier_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_Periodic_Consumer_Command,TAO_NS_Name::periodic_consumer_command_factory);
-TAO_NS_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_NS_Filter_Command,TAO_NS_Name::filter_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_EventChannel_Command,TAO_Notify_Tests_Name::event_channel_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_Application_Command,TAO_Notify_Tests_Name::application_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_SupplierAdmin_Command,TAO_Notify_Tests_Name::supplier_admin_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_ConsumerAdmin_Command,TAO_Notify_Tests_Name::consumer_admin_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_Periodic_Supplier_Command,TAO_Notify_Tests_Name::periodic_supplier_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_Periodic_Consumer_Command,TAO_Notify_Tests_Name::periodic_consumer_command_factory);
+TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(TAO_NOTIFY_TEST,TAO_Notify_Tests_Filter_Command,TAO_Notify_Tests_Name::filter_command_factory);
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Command_Factory_T<TAO_NS_EventChannel_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_Application_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_SupplierAdmin_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_ConsumerAdmin_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_Periodic_Supplier_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_Periodic_Consumer_Command>;
-template class TAO_NS_Command_Factory_T<TAO_NS_Filter_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_EventChannel_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Application_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_SupplierAdmin_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_ConsumerAdmin_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Periodic_Supplier_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Periodic_Consumer_Command>;
+template class TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Filter_Command>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_EventChannel_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_Application_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_SupplierAdmin_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_ConsumerAdmin_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_Periodic_Supplier_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_Periodic_Consumer_Command>
-#pragma instantiate TAO_NS_Command_Factory_T<TAO_NS_Filter_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_EventChannel_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Application_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_SupplierAdmin_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_ConsumerAdmin_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Periodic_Supplier_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Periodic_Consumer_Command>
+#pragma instantiate TAO_Notify_Tests_Command_Factory_T<TAO_Notify_Tests_Filter_Command>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
index beb9a446c68..8c86b61aea9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.h
@@ -15,9 +15,9 @@
 
 #include "Command_Factory_T.h"
 
-#define TAO_NS_COMMAND_FACTORY_DEFINE(export, command, factory_name) \
+#define TAO_Notify_Tests_COMMAND_FACTORY_DEFINE(export, command, factory_name) \
 \
-typedef TAO_NS_Command_Factory_T <command> command##_Factory;\
+typedef TAO_Notify_Tests_Command_Factory_T <command> command##_Factory;\
 \
 ACE_STATIC_SVC_DECLARE_EXPORT (export, command##_Factory) \
 \
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index e449e049440..8976cd3e561 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -8,28 +8,28 @@ ACE_RCSID(lib, TAO_Filter_Command, "$id$")
 #include "LookupManager.h"
 #include "Name.h"
 
-TAO_NS_Filter_Command::TAO_NS_Filter_Command (void)
+TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command (void)
 {
 }
 
-TAO_NS_Filter_Command::~TAO_NS_Filter_Command ()
+TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command ()
 {
 }
 
 const char*
-TAO_NS_Filter_Command::get_name (void)
+TAO_Notify_Tests_Filter_Command::get_name (void)
 {
-  return TAO_NS_Filter_Command::name ();
+  return TAO_Notify_Tests_Filter_Command::name ();
 }
 
 const char*
-TAO_NS_Filter_Command::name (void)
+TAO_Notify_Tests_Filter_Command::name (void)
 {
-  return TAO_NS_Name::filter_command;
+  return TAO_Notify_Tests_Name::filter_command;
 }
 
 void
-TAO_NS_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -98,7 +98,7 @@ TAO_NS_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -114,7 +114,7 @@ TAO_NS_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::FilterFactory_var ff;
 
@@ -130,7 +130,7 @@ TAO_NS_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -149,7 +149,7 @@ TAO_NS_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -166,7 +166,7 @@ TAO_NS_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::Filter_var filter;
 
@@ -178,7 +178,7 @@ TAO_NS_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE_FACTORY)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 243b34728da..625897dbdf8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_FILTER_COMMAND_H
-#define TAO_NS_FILTER_COMMAND_H
+#ifndef TAO_Notify_Tests_FILTER_COMMAND_H
+#define TAO_Notify_Tests_FILTER_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,19 +24,19 @@
 #include "Command.h"
 
 /**
- * @class TAO_NS_Filter_Command
+ * @class TAO_Notify_Tests_Filter_Command
  *
  * @brief Command for Filter Objects.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Filter_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_Filter_Command (void);
+  TAO_Notify_Tests_Filter_Command (void);
 
   /// Destructor
-  ~TAO_NS_Filter_Command ();
+  ~TAO_Notify_Tests_Filter_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -80,4 +80,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_FILTER_COMMAND_H */
+#endif /* TAO_Notify_Tests_FILTER_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index b00d532ad54..651f3af6468 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -6,30 +6,30 @@ ACE_RCSID(lib, TAO_LookupManager, "$id$")
 
 #include "Name.h"
 
-TAO_NS_LookupManager::TAO_NS_LookupManager (void)
+TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void)
   : app_ (0)
     , activation_manager_ (0)
     , priority_mapping_ (0)
 {
 }
 
-TAO_NS_LookupManager::~TAO_NS_LookupManager ()
+TAO_Notify_Tests_LookupManager::~TAO_Notify_Tests_LookupManager ()
 {
 }
 
 void
-TAO_NS_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 
-  this->resolve (this->root_poa_, TAO_NS_Name::root_poa ACE_ENV_ARG_PARAMETER);
+  this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->resolve (this->naming_, TAO_NS_Name::naming_service ACE_ENV_ARG_PARAMETER);
+  this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL)
 {
   CosNaming::Name_var name =
     this->naming_->to_name (obj_name
@@ -45,66 +45,66 @@ TAO_NS_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name ACE
 }
 
 void
-TAO_NS_LookupManager::_register (TAO_NS_Driver_Base* app)
+TAO_Notify_Tests_LookupManager::_register (TAO_Notify_Tests_Driver_Base* app)
 {
   this->app_ = app;
 }
 
 void
-TAO_NS_LookupManager::resolve (TAO_NS_Driver_Base*& app)
+TAO_Notify_Tests_LookupManager::resolve (TAO_Notify_Tests_Driver_Base*& app)
 {
   app = this->app_;
 }
 
 void
-TAO_NS_LookupManager::_register (TAO_NS_Activation_Manager* activation_manager)
+TAO_Notify_Tests_LookupManager::_register (TAO_Notify_Tests_Activation_Manager* activation_manager)
 {
   this->activation_manager_ = activation_manager;
 }
 
 void
-TAO_NS_LookupManager::resolve (TAO_NS_Activation_Manager*& activation_manager)
+TAO_Notify_Tests_LookupManager::resolve (TAO_Notify_Tests_Activation_Manager*& activation_manager)
 {
   activation_manager = this->activation_manager_;
 }
 
 void
-TAO_NS_LookupManager::_register (TAO_NS_Priority_Mapping* priority_mapping)
+TAO_Notify_Tests_LookupManager::_register (TAO_Notify_Tests_Priority_Mapping* priority_mapping)
 {
   this->priority_mapping_ = priority_mapping;
 }
 
 void
-TAO_NS_LookupManager::resolve (TAO_NS_Priority_Mapping* &priority_mapping)
+TAO_Notify_Tests_LookupManager::resolve (TAO_Notify_Tests_Priority_Mapping* &priority_mapping)
 {
   priority_mapping = this->priority_mapping_;
 }
 
 void
-TAO_NS_LookupManager::resolve (CORBA::ORB_var& orb)
+TAO_Notify_Tests_LookupManager::resolve (CORBA::ORB_var& orb)
 {
   orb = this->orb_;
 }
 
 void
-TAO_NS_LookupManager::resolve (PortableServer::POA_var& poa)
+TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa)
 {
   poa = this->root_poa_;
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNaming::NamingContextExt_var& naming)
+TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming)
 {
   naming = this->naming_;
 }
 
 void
-TAO_NS_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL)
 {
-  if (ACE_OS::strcmp (poa_name, TAO_NS_Name::root_poa) == 0)
+  if (ACE_OS::strcmp (poa_name, TAO_Notify_Tests_Name::root_poa) == 0)
     {
       CORBA::Object_ptr poa_object  =
-                this->orb_->resolve_initial_references(TAO_NS_Name::root_poa ACE_ENV_ARG_PARAMETER);
+                this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (poa_object))
@@ -127,7 +127,7 @@ TAO_NS_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_nam
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (naming_name ACE_ENV_ARG_PARAMETER);
@@ -147,7 +147,7 @@ TAO_NS_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const ch
 }
 
 CORBA::Object_ptr
-TAO_NS_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -161,7 +161,7 @@ TAO_NS_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (factory_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -171,7 +171,7 @@ TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& e
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (channel_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -181,7 +181,7 @@ TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, cons
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -191,7 +191,7 @@ TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, con
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -201,7 +201,7 @@ TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , co
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -211,7 +211,7 @@ TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& suppli
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -221,7 +221,7 @@ TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consum
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (filter_factory_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -231,7 +231,7 @@ TAO_NS_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const cha
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (filter_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -241,7 +241,7 @@ TAO_NS_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object = this->resolve_object (filter_admin_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -252,10 +252,10 @@ TAO_NS_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, c
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Singleton<TAO_NS_LookupManager, TAO_SYNCH_MUTEX>;
+template class ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Singleton<TAO_NS_LookupManager, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index a62fd7471b7..11354442eeb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_LOOKUPMANAGER_H
-#define TAO_NS_LOOKUPMANAGER_H
+#ifndef TAO_Notify_Tests_LOOKUPMANAGER_H
+#define TAO_Notify_Tests_LOOKUPMANAGER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -25,26 +25,26 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Hash_Map_Manager.h"
 
-class TAO_NS_Periodic_Supplier;
-class TAO_NS_Periodic_Consumer;
-class TAO_NS_Driver_Base;
-class TAO_NS_Activation_Manager;
-class TAO_NS_Priority_Mapping;
+class TAO_Notify_Tests_Periodic_Supplier;
+class TAO_Notify_Tests_Periodic_Consumer;
+class TAO_Notify_Tests_Driver_Base;
+class TAO_Notify_Tests_Activation_Manager;
+class TAO_Notify_Tests_Priority_Mapping;
 
 /**
- * @class TAO_NS_LookupManager
+ * @class TAO_Notify_Tests_LookupManager
  *
  * @brief Utility to register and resolve object references.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_LookupManager
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
 {
 public:
   /// Constuctor
-  TAO_NS_LookupManager (void);
+  TAO_Notify_Tests_LookupManager (void);
 
   /// Destructor
-  ~TAO_NS_LookupManager ();
+  ~TAO_Notify_Tests_LookupManager ();
 
   /// Init
   void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
@@ -52,9 +52,9 @@ public:
   ///= Register Objects
 
   /// Register the application starter object.
-  void _register (TAO_NS_Driver_Base* app);
-  void _register (TAO_NS_Activation_Manager* activation_manager);
-  void _register (TAO_NS_Priority_Mapping *priority_mapping);
+  void _register (TAO_Notify_Tests_Driver_Base* app);
+  void _register (TAO_Notify_Tests_Activation_Manager* activation_manager);
+  void _register (TAO_Notify_Tests_Priority_Mapping *priority_mapping);
 
   /// Register Objects with Naming Service
   void _register(CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL);
@@ -62,9 +62,9 @@ public:
   ///= Resolve methods
 
   /// Resolve the application starter object.
-  void resolve (TAO_NS_Driver_Base*& app);
-  void resolve (TAO_NS_Activation_Manager*& activation_manager);
-  void resolve (TAO_NS_Priority_Mapping* &priority_mapping);
+  void resolve (TAO_Notify_Tests_Driver_Base*& app);
+  void resolve (TAO_Notify_Tests_Activation_Manager*& activation_manager);
+  void resolve (TAO_Notify_Tests_Priority_Mapping* &priority_mapping);
 
   /// Return the orb
   void resolve (CORBA::ORB_var& orb);
@@ -89,10 +89,10 @@ public:
 
 protected:
   /// Application Starter
-  TAO_NS_Driver_Base* app_;
+  TAO_Notify_Tests_Driver_Base* app_;
 
   /// Activation Manager
-  TAO_NS_Activation_Manager* activation_manager_;
+  TAO_Notify_Tests_Activation_Manager* activation_manager_;
 
   /// Resolve to CORBA::Object
   CORBA::Object_ptr resolve_object (const char* obj_name ACE_ENV_ARG_DECL);
@@ -107,14 +107,14 @@ protected:
   CosNaming::NamingContextExt_var naming_;
 
   // Priority Mapping.
-  TAO_NS_Priority_Mapping *priority_mapping_;
+  TAO_Notify_Tests_Priority_Mapping *priority_mapping_;
 };
 
-typedef ACE_Singleton<TAO_NS_LookupManager, TAO_SYNCH_MUTEX> _TAO_NS_LookupManager;
+typedef ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX> _TAO_Notify_Tests_LookupManager;
 
-TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_NS_LookupManager, TAO_SYNCH_MUTEX);
+TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX);
 
-#define LOOKUP_MANAGER  _TAO_NS_LookupManager::instance()
+#define LOOKUP_MANAGER  _TAO_Notify_Tests_LookupManager::instance()
 
 #include "ace/post.h"
-#endif /* TAO_NS_LOOKUPMANAGER_H */
+#endif /* TAO_Notify_Tests_LOOKUPMANAGER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index 6a8d4d99dff..27683ee29a9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -4,34 +4,34 @@
 
 ACE_RCSID(lib, TAO_Name, "$id$")
 
-#define TAO_NS_DECLARE_NAME(target, name) \
-const char* const TAO_NS_Name::target = ACE_TEXT (name);
+#define TAO_Notify_Tests_DECLARE_NAME(target, name) \
+const char* const TAO_Notify_Tests_Name::target = ACE_TEXT (name);
 
-TAO_NS_DECLARE_NAME (command_builder,"Command_Builder")
-TAO_NS_DECLARE_NAME (root_poa,"RootPOA")
-TAO_NS_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory");
-TAO_NS_DECLARE_NAME (naming_service,"NameService");
+TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder")
+TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA")
+TAO_Notify_Tests_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory");
+TAO_Notify_Tests_DECLARE_NAME (naming_service,"NameService");
 
-TAO_NS_DECLARE_NAME (application_command,"Application");
-TAO_NS_DECLARE_NAME (application_command_factory,"Application_Command_Factory");
+TAO_Notify_Tests_DECLARE_NAME (application_command,"Application");
+TAO_Notify_Tests_DECLARE_NAME (application_command_factory,"Application_Command_Factory");
 
-TAO_NS_DECLARE_NAME (event_channel_command,"EventChannel")
-TAO_NS_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (event_channel_command,"EventChannel")
+TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory")
 
-TAO_NS_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin")
-TAO_NS_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin")
+TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory")
 
-TAO_NS_DECLARE_NAME (supplier_admin_command,"SupplierAdmin")
-TAO_NS_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command,"SupplierAdmin")
+TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory")
 
-TAO_NS_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier");
-TAO_NS_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory");
+TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier");
+TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory");
 
-TAO_NS_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer");
-TAO_NS_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory");
+TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer");
+TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory");
 
-TAO_NS_DECLARE_NAME (poa_command, "POA");
-TAO_NS_DECLARE_NAME (poa_command_factory, "POA_Command_Factory");
+TAO_Notify_Tests_DECLARE_NAME (poa_command, "POA");
+TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, "POA_Command_Factory");
 
-TAO_NS_DECLARE_NAME (filter_command, "Filter");
-TAO_NS_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory");
+TAO_Notify_Tests_DECLARE_NAME (filter_command, "Filter");
+TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory");
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h
index 948ce3c8fb7..b98851a9c01 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_NAME_H
-#define TAO_NS_NAME_H
+#ifndef TAO_Notify_Tests_NAME_H
+#define TAO_Notify_Tests_NAME_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -20,12 +20,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
- * @class TAO_NS_Name
+ * @class TAO_Notify_Tests_Name
  *
  * @brief Define the names for command objects and other common strings.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Name
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Name
 {
 public:
   static const char* const root_poa;
@@ -60,4 +60,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_NAME_H */
+#endif /* TAO_Notify_Tests_NAME_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index 54bd0446efc..947f5ebaa6b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -30,7 +30,7 @@
 
 #include "PushConsumer.h"
 
-typedef TAO_NS_PushConsumer TAO_Notify_PushConsumer;
+typedef TAO_Notify_Tests_PushConsumer TAO_Notify_PushConsumer;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index 4045e9a2eb6..30e6a8b867d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -6,7 +6,7 @@
 
 #include "PushSupplier.h"
 
-typedef TAO_NS_PushSupplier TAO_Notify_PushSupplier;
+typedef TAO_Notify_Tests_PushSupplier TAO_Notify_PushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index dd062a7724a..f9e3e413d34 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -23,7 +23,7 @@
 
 #include "SequencePushConsumer.h"
 
-typedef TAO_NS_SequencePushConsumer TAO_Notify_SequencePushConsumer;
+typedef TAO_Notify_Tests_SequencePushConsumer TAO_Notify_SequencePushConsumer;
 
 #include "ace/post.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index c4811fb02ee..995b75dbc70 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -23,7 +23,7 @@
 
 #include "SequencePushSupplier.h"
 
-typedef TAO_NS_SequencePushSupplier TAO_Notify_SequencePushSupplier;
+typedef TAO_Notify_Tests_SequencePushSupplier TAO_Notify_SequencePushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_SequencePUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index 8e76e9e55c4..b204bcd089a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -23,7 +23,7 @@
 
 #include "StructuredPushConsumer.h"
 
-typedef TAO_NS_StructuredPushConsumer TAO_Notify_StructuredPushConsumer;
+typedef TAO_Notify_Tests_StructuredPushConsumer TAO_Notify_StructuredPushConsumer;
 
 #include "ace/post.h"
 #endif /* NOTIFY_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index 7a658e9df91..68ab338b99e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -23,7 +23,7 @@
 
 #include "StructuredPushSupplier.h"
 
-typedef TAO_NS_StructuredPushSupplier TAO_Notify_StructuredPushSupplier;
+typedef TAO_Notify_Tests_StructuredPushSupplier TAO_Notify_StructuredPushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 519c8877ed2..f29374aba02 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -7,16 +7,16 @@ ACE_RCSID(lib, TAO_Options_Parser, "$id$")
 #include "tao/debug.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_NS_Options_Parser::TAO_NS_Options_Parser (void)
+TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
 {
 }
 
-TAO_NS_Options_Parser::~TAO_NS_Options_Parser ()
+TAO_Notify_Tests_Options_Parser::~TAO_Notify_Tests_Options_Parser ()
 {
 }
 
 void
-TAO_NS_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter)
 {
   const ACE_TCHAR* current_arg = 0;
 
@@ -47,7 +47,7 @@ TAO_NS_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotific
 }
 
 void
-TAO_NS_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter)
 {
   const ACE_TCHAR *current_arg = 0;
   int default_priority = ACE_DEFAULT_THREAD_PRIORITY;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index c8eef3d078b..b59bb771f0f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_OPTIONS_PARSER_H
-#define TAO_NS_OPTIONS_PARSER_H
+#ifndef TAO_Notify_Tests_OPTIONS_PARSER_H
+#define TAO_Notify_Tests_OPTIONS_PARSER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -23,19 +23,19 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_Options_Parser
+ * @class TAO_Notify_Tests_Options_Parser
  *
  * @brief Common Options parsing code.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Options_Parser
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser
 {
 public:
   /// Constuctor
-  TAO_NS_Options_Parser (void);
+  TAO_Notify_Tests_Options_Parser (void);
 
   /// Destructor
-  ~TAO_NS_Options_Parser ();
+  ~TAO_Notify_Tests_Options_Parser ();
 
   /// Populates <qos> with options apecified in <arg_shifter>
   void execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter);
@@ -45,4 +45,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_OPTIONS_PARSER_H */
+#endif /* TAO_Notify_Tests_OPTIONS_PARSER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 974a53c3313..9940b601752 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -14,24 +14,24 @@ ACE_RCSID(lib, TAO_Peer, "$id$")
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_NS_Peer::TAO_NS_Peer (void)
-  : poa_name_ (TAO_NS_Name::root_poa)
+TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
+  : poa_name_ (TAO_Notify_Tests_Name::root_poa)
   , ifgop_ (CosNotifyChannelAdmin::OR_OP)
 {
 }
 
-TAO_NS_Peer::~TAO_NS_Peer ()
+TAO_Notify_Tests_Peer::~TAO_Notify_Tests_Peer ()
 {
 }
 
 void
-TAO_NS_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 int
-TAO_NS_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
 {
   while (arg_shifter.is_anything_left ())
     {
@@ -61,7 +61,7 @@ TAO_NS_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
         {
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
       else
@@ -74,19 +74,19 @@ TAO_NS_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_Peer::set_name (ACE_CString& name)
+TAO_Notify_Tests_Peer::set_name (ACE_CString& name)
 {
   this->name_ = name;
 }
 
 const ACE_CString&
-TAO_NS_Peer::get_name (void)
+TAO_Notify_Tests_Peer::get_name (void)
 {
   return this->name_;
 }
 
 void
-TAO_NS_Peer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index 2c4a049b8ff..ab0e8a9a35b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PEER_H
-#define TAO_NS_PEER_H
+#ifndef TAO_Notify_Tests_PEER_H
+#define TAO_Notify_Tests_PEER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -25,19 +25,19 @@
 class ACE_Arg_Shifter;
 
 /**
- * @class TAO_NS_Peer
+ * @class TAO_Notify_Tests_Peer
  *
  * @brief
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Peer
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer
 {
 public:
   /// Constuctor
-  TAO_NS_Peer (void);
+  TAO_Notify_Tests_Peer (void);
 
   /// Destructor
-  virtual ~TAO_NS_Peer ();
+  virtual ~TAO_Notify_Tests_Peer ();
 
   /// Init
   void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED);
@@ -77,4 +77,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PEER_H */
+#endif /* TAO_Notify_Tests_PEER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index d14da501991..10fdfcd0369 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Peer_T_CPP
-#define TAO_NS_Peer_T_CPP
+#ifndef TAO_Notify_Tests_Peer_T_CPP
+#define TAO_Notify_Tests_Peer_T_CPP
 
 #include "Peer_T.h"
 
@@ -8,7 +8,7 @@
 #include "Peer_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Peer_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Tests_Peer_T, "$id$")
 
 #include "ace/Arg_Shifter.h"
 #include "Name.h"
@@ -17,30 +17,30 @@ ACE_RCSID(Notify, TAO_NS_Peer_T, "$id$")
 #include "orbsvcs/NotifyExtC.h"
 
 template <class Peer_Traits>
-TAO_NS_Peer_T<Peer_Traits>::TAO_NS_Peer_T (void)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
   : proxy_id_ (0)
 {
 }
 
 template <class Peer_Traits>
-TAO_NS_Peer_T<Peer_Traits>::~TAO_NS_Peer_T ()
+TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T ()
 {
 }
 
-template <class Peer_Traits> ACE_TYPENAME TAO_NS_Peer_T<Peer_Traits>::Proxy_Traits_PTR
-TAO_NS_Peer_T<Peer_Traits>::get_proxy (void)
+template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
 {
   return proxy_.in ();
 }
 
-template <class Peer_Traits> ACE_TYPENAME TAO_NS_Peer_T<Peer_Traits>::Peer_Traits_PTR
-TAO_NS_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
+template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
+TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL)
 {
   PortableServer::ServantBase_var servant_var (this);
 
@@ -61,7 +61,7 @@ TAO_NS_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID pro
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
 {
   ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ptr ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -74,7 +74,7 @@ TAO_NS_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL
 
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the POA
   PortableServer::POA_var poa;
@@ -109,14 +109,14 @@ TAO_NS_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
 {
   this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   ACE_TRY
@@ -150,7 +150,7 @@ TAO_NS_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
@@ -161,13 +161,13 @@ TAO_NS_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 template <class Peer_Traits> PortableServer::POA_ptr
-TAO_NS_Peer_T<Peer_Traits>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 template <class Peer_Traits> void
-TAO_NS_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
@@ -181,4 +181,4 @@ TAO_NS_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
-#endif /* TAO_NS_Peer_T_CPP */
+#endif /* TAO_Notify_Tests_Peer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 1b398df7bdc..16bcf1351a3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PEER_T_H
-#define TAO_NS_PEER_T_H
+#ifndef TAO_Notify_Tests_PEER_T_H
+#define TAO_Notify_Tests_PEER_T_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -23,13 +23,13 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 /**
- * @class TAO_NS_Peer_T
+ * @class TAO_Notify_Tests_Peer_T
  *
  * @brief Base implementation for all Supplier and Consumer Classes.
  *
  */
 template <class Peer_Traits>
-class TAO_NOTIFY_TEST_Export TAO_NS_Peer_T : public TAO_NS_Peer, public Peer_Traits::SKELETON, public PortableServer::RefCountServantBase
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON, public PortableServer::RefCountServantBase
 {
   typedef ACE_TYPENAME Peer_Traits::Admin_Traits Admin_Traits;
   typedef ACE_TYPENAME Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
@@ -48,10 +48,10 @@ class TAO_NOTIFY_TEST_Export TAO_NS_Peer_T : public TAO_NS_Peer, public Peer_Tra
 
 public:
   /// Constuctor
-  TAO_NS_Peer_T (void);
+  TAO_Notify_Tests_Peer_T (void);
 
   /// Destructor
-  virtual ~TAO_NS_Peer_T ();
+  virtual ~TAO_Notify_Tests_Peer_T ();
 
   // Activates this servant with the POA supplied in init.
   // Connects to given proxy.
@@ -124,4 +124,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PEER_T_H */
+#endif /* TAO_Notify_Tests_PEER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 34dd3d71464..dcccba1b56b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -12,11 +12,11 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID(RT_Notify, TAO_NS_Periodic_Consumer, "$id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Consumer, "$id$")
 
 int WARMUP_COUNT = 10;
 
-TAO_NS_Periodic_Consumer::TAO_NS_Periodic_Consumer (void)
+TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void)
   : count_ (-2)
   , warmup_countdown_ (WARMUP_COUNT)
   , max_count_ (-1)
@@ -27,21 +27,21 @@ TAO_NS_Periodic_Consumer::TAO_NS_Periodic_Consumer (void)
 {
 }
 
-TAO_NS_Periodic_Consumer::~TAO_NS_Periodic_Consumer ()
+TAO_Notify_Tests_Periodic_Consumer::~TAO_Notify_Tests_Periodic_Consumer ()
 {
 }
 
 void
-TAO_NS_Periodic_Consumer::task_callback (TAO_NS_Task_Callback* client)
+TAO_Notify_Tests_Periodic_Consumer::task_callback (TAO_Notify_Tests_Task_Callback* client)
 {
   this->client_ = client;
 }
 
 int
-TAO_NS_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
 {
   // First, let the base class look for options.
-  if (TAO_Notify_StructuredPushConsumer::init_state (arg_shifter) == -1)
+  if (TAO_Notify_Tests_StructuredPushConsumer::init_state (arg_shifter) == -1)
     return -1;
 
   const ACE_TCHAR *current_arg = 0;
@@ -75,7 +75,7 @@ TAO_NS_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_Periodic_Consumer::handle_start_event (const CosNotification::PropertySeq& prop_seq)
+TAO_Notify_Tests_Periodic_Consumer::handle_start_event (const CosNotification::PropertySeq& prop_seq)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received inital (-1)th event \n", this->name_.c_str ()));
@@ -112,7 +112,7 @@ TAO_NS_Periodic_Consumer::handle_start_event (const CosNotification::PropertySeq
 }
 
 void
-TAO_NS_Periodic_Consumer::check_priority (const CosNotification::PropertySeq& prop_seq)
+TAO_Notify_Tests_Periodic_Consumer::check_priority (const CosNotification::PropertySeq& prop_seq)
 {
   // Check if the event carries a Priority.
   int event_has_priority_set = 0;
@@ -147,7 +147,7 @@ TAO_NS_Periodic_Consumer::check_priority (const CosNotification::PropertySeq& pr
 
       CORBA::Short native_priority = CORBA::Short (priority);
 
-      TAO_NS_Priority_Mapping* priority_mapping;
+      TAO_Notify_Tests_Priority_Mapping* priority_mapping;
       LOOKUP_MANAGER->resolve (priority_mapping);
 
       CORBA::Short corba_priority;
@@ -167,7 +167,7 @@ TAO_NS_Periodic_Consumer::check_priority (const CosNotification::PropertySeq& pr
 }
 
 void
-TAO_NS_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -252,7 +252,7 @@ TAO_NS_Periodic_Consumer::push_structured_event (const CosNotification::Structur
 }
 
 void
-TAO_NS_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples)
+TAO_Notify_Tests_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 33981868f82..faf983684b7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PERIODIC_CONSUMER_H
-#define TAO_NS_PERIODIC_CONSUMER_H
+#ifndef TAO_Notify_Tests_PERIODIC_CONSUMER_H
+#define TAO_Notify_Tests_PERIODIC_CONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,27 +22,27 @@
 #include "Task_Stats.h"
 #include "Notify_StructuredPushConsumer.h"
 
-class TAO_NS_Task_Callback;
+class TAO_Notify_Tests_Task_Callback;
 class ACE_Barrier;
 class ACE_Arg_Shifter;
 
 /**
- * @class TAO_NS_Periodic_Consumer
+ * @class TAO_Notify_Tests_Periodic_Consumer
  *
  * @brief Receives Structured events periodically.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Periodic_Consumer : public TAO_Notify_StructuredPushConsumer
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   /// Constuctor
-  TAO_NS_Periodic_Consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer (void);
 
   /// Destructor
-  ~TAO_NS_Periodic_Consumer ();
+  ~TAO_Notify_Tests_Periodic_Consumer ();
 
   /// set the helper callback
-  void task_callback(TAO_NS_Task_Callback* client);
+  void task_callback(TAO_Notify_Tests_Task_Callback* client);
 
   /// Init the state of this object.
   virtual int init_state (ACE_Arg_Shifter& arg_shifter);
@@ -86,7 +86,7 @@ protected:
   Task_Stats stats_;
 
   /// Client
-  TAO_NS_Task_Callback* client_;
+  TAO_Notify_Tests_Task_Callback* client_;
 
   /// Flag to indicate if we want to check the expected priority.
   int check_priority_;
@@ -96,4 +96,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_PERIODIC_CONSUMER_H */
+#endif /* TAO_Notify_Tests_PERIODIC_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 62531a0a5d6..21d5b7417ab 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -13,28 +13,28 @@ ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$id$")
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_NS_Periodic_Consumer_Command::TAO_NS_Periodic_Consumer_Command (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
 {
 }
 
-TAO_NS_Periodic_Consumer_Command::~TAO_NS_Periodic_Consumer_Command ()
+TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_Command ()
 {
 }
 
 const char*
-TAO_NS_Periodic_Consumer_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void)
 {
-  return TAO_NS_Periodic_Consumer_Command::name ();
+  return TAO_Notify_Tests_Periodic_Consumer_Command::name ();
 }
 
 const char*
-TAO_NS_Periodic_Consumer_Command::name (void)
+TAO_Notify_Tests_Periodic_Consumer_Command::name (void)
 {
-  return TAO_NS_Name::periodic_consumer_command;
+  return TAO_Notify_Tests_Name::periodic_consumer_command;
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -68,19 +68,19 @@ TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
               arg_shifter.consume_arg ();
             }
 
-          TAO_NS_Periodic_Consumer* consumer = 0;
+          TAO_Notify_Tests_Periodic_Consumer* consumer = 0;
 
           // create the consumer
           if (is_relay == 1)
-            consumer = new TAO_NS_Relay_Consumer (relay_destination);
+            consumer = new TAO_Notify_Tests_Relay_Consumer (relay_destination);
           else if (is_direct == 1)
-            consumer = new TAO_NS_Direct_Consumer ();
+            consumer = new TAO_Notify_Tests_Direct_Consumer ();
           else
-            consumer = new TAO_NS_Periodic_Consumer ();
+            consumer = new TAO_Notify_Tests_Periodic_Consumer ();
 
           consumer->set_name (this->name_);
 
-         TAO_NS_Activation_Manager* act_mgr = 0;
+         TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
@@ -101,7 +101,7 @@ TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser options_parser;
+          TAO_Notify_Tests_Options_Parser options_parser;
           options_parser.execute (this->added_, this->removed_, arg_shifter);
         } /* Subscription */
       else if (arg_shifter.cur_arg_strncasecmp ("-Disconnect") == 0) //
@@ -141,21 +141,21 @@ TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     }
 }
 
-TAO_NS_Periodic_Consumer*
-TAO_NS_Periodic_Consumer_Command::consumer (void)
+TAO_Notify_Tests_Periodic_Consumer*
+TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
 {
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
 
   LOOKUP_MANAGER->resolve (act_mgr);
 
   // Locate the consumer
-  TAO_NS_Periodic_Consumer* consumer = 0;
+  TAO_Notify_Tests_Periodic_Consumer* consumer = 0;
 
   {
     ACE_DECLARE_NEW_CORBA_ENV;
@@ -170,16 +170,16 @@ TAO_NS_Periodic_Consumer_Command::consumer (void)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Consumer* consumer = this->consumer ();
+  TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
   if (consumer == 0)
     return;
@@ -191,9 +191,9 @@ TAO_NS_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Consumer* consumer= this->consumer ();
+  TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
     return;
 
@@ -202,9 +202,9 @@ TAO_NS_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Consumer* consumer= this->consumer ();
+  TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
     return;
 
@@ -213,9 +213,9 @@ TAO_NS_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Consumer* consumer = this->consumer ();
+  TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
   if (consumer == 0)
     return;
 
@@ -224,9 +224,9 @@ TAO_NS_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Consumer* consumer = this->consumer ();
+  TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
   if (consumer == 0)
     return;
@@ -236,7 +236,7 @@ TAO_NS_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 69376f5f7a1..9ae475ba4a1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PERIODICCONSUMER_COMMAND_H
-#define TAO_NS_PERIODICCONSUMER_COMMAND_H
+#ifndef TAO_Notify_Tests_PERIODICCONSUMER_COMMAND_H
+#define TAO_Notify_Tests_PERIODICCONSUMER_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -23,22 +23,22 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
-class TAO_NS_Periodic_Consumer;
+class TAO_Notify_Tests_Periodic_Consumer;
 
 /**
- * @class TAO_NS_Periodic_Consumer_Command
+ * @class TAO_Notify_Tests_Periodic_Consumer_Command
  *
  * @brief Options for Periodic Consumers.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Periodic_Consumer_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_Periodic_Consumer_Command (void);
+  TAO_Notify_Tests_Periodic_Consumer_Command (void);
 
   /// Destructor
-  ~TAO_NS_Periodic_Consumer_Command ();
+  ~TAO_Notify_Tests_Periodic_Consumer_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -80,7 +80,7 @@ protected:
 
   ///= Methods
   // Retreive the consumer.
-  TAO_NS_Periodic_Consumer* consumer (void);
+  TAO_Notify_Tests_Periodic_Consumer* consumer (void);
 
   ///= Handlers
   void handle_create (ACE_ENV_SINGLE_ARG_DECL);
@@ -92,4 +92,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_PERIODICCONSUMER_COMMAND_H */
+#endif /* TAO_Notify_Tests_PERIODICCONSUMER_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index b43874cafd4..be6d8a983b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -13,9 +13,9 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID(RT_Notify, TAO_NS_Periodic_Supplier, "$id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Supplier, "$id$")
 
-TAO_NS_Periodic_Supplier::TAO_NS_Periodic_Supplier (void)
+TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
   : barrier_ (0),
     priority_ (0),
     period_ (0),
@@ -29,22 +29,22 @@ TAO_NS_Periodic_Supplier::TAO_NS_Periodic_Supplier (void)
 {
 }
 
-TAO_NS_Periodic_Supplier::~TAO_NS_Periodic_Supplier ()
+TAO_Notify_Tests_Periodic_Supplier::~TAO_Notify_Tests_Periodic_Supplier ()
 {
 }
 
 
 void
-TAO_NS_Periodic_Supplier::task_callback(TAO_NS_Task_Callback* client)
+TAO_Notify_Tests_Periodic_Supplier::task_callback(TAO_Notify_Tests_Task_Callback* client)
 {
   this->client_ = client;
 }
 
 int
-TAO_NS_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
 {
   // First, let the base class look for options.
-  if (TAO_Notify_StructuredPushSupplier::init_state (arg_shifter) == -1)
+  if (TAO_Notify_Tests_StructuredPushSupplier::init_state (arg_shifter) == -1)
     return -1;
 
   const ACE_TCHAR *current_arg = 0;
@@ -130,7 +130,7 @@ TAO_NS_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
 }
 
 int
-TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
+TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 {
   barrier_ = barrier;
 
@@ -143,7 +143,7 @@ TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
   flags |=
     orb->orb_core ()->orb_params ()->thread_creation_flags ();
 
-  TAO_NS_Priority_Mapping* priority_mapping;
+  TAO_Notify_Tests_Priority_Mapping* priority_mapping;
   LOOKUP_MANAGER->resolve (priority_mapping);
 
   CORBA::Short native_prio;
@@ -174,7 +174,7 @@ TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 }
 
 void
-TAO_NS_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
 {
   int WARMUP_COUNT = 10;
 
@@ -186,7 +186,7 @@ TAO_NS_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
 {
   // populate event.
   // send the base time and max count.
@@ -212,7 +212,7 @@ TAO_NS_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -297,7 +297,7 @@ TAO_NS_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_NS_Periodic_Supplier::svc (void)
+TAO_Notify_Tests_Periodic_Supplier::svc (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
@@ -336,7 +336,7 @@ TAO_NS_Periodic_Supplier::svc (void)
 }
 
 void
-TAO_NS_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples)
+TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index b65de4fcfed..1d306ca9a11 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PERIODIC_SUPPLIER_H
-#define TAO_NS_PERIODIC_SUPPLIER_H
+#ifndef TAO_Notify_Tests_PERIODIC_SUPPLIER_H
+#define TAO_Notify_Tests_PERIODIC_SUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,27 +24,27 @@
 #include "Task_Stats.h"
 #include "StructuredEvent.h"
 
-class TAO_NS_Task_Callback;
+class TAO_Notify_Tests_Task_Callback;
 class ACE_Barrier;
 class ACE_Arg_Shifter;
 
 /**
- * @class TAO_NS_Periodic_Supplier
+ * @class TAO_Notify_Tests_Periodic_Supplier
  *
  * @brief A Periodic Supplier.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Periodic_Supplier : public TAO_Notify_StructuredPushSupplier, public ACE_Task <ACE_SYNCH>
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Notify_Tests_StructuredPushSupplier, public ACE_Task <ACE_SYNCH>
 {
 public:
   /// Constuctor
-  TAO_NS_Periodic_Supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier (void);
 
   /// Destructor
-  ~TAO_NS_Periodic_Supplier ();
+  ~TAO_Notify_Tests_Periodic_Supplier ();
 
   /// set the helper callback
-  void task_callback(TAO_NS_Task_Callback* client);
+  void task_callback(TAO_Notify_Tests_Task_Callback* client);
 
   /// Init the state of this object.
   int init_state (ACE_Arg_Shifter& arg_shifter);
@@ -76,9 +76,9 @@ protected:
   ACE_Barrier* barrier_;
 
   /// The event to send.
-  TAO_NS_StructuredEvent event_;
+  TAO_Notify_Tests_StructuredEvent event_;
 
-  TAO_NS_StructuredEvent zeroth_event;
+  TAO_Notify_Tests_StructuredEvent zeroth_event;
 
   /// The priority of this task.
   CORBA::Short priority_;
@@ -108,8 +108,8 @@ protected:
   Task_Stats stats_;
 
   /// Client
-  TAO_NS_Task_Callback* client_;
+  TAO_Notify_Tests_Task_Callback* client_;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_PERIODIC_SUPPLIER_H */
+#endif /* TAO_Notify_Tests_PERIODIC_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 041e69f4637..2b7b6a4ce14 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -12,28 +12,28 @@ ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$id$")
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_NS_Periodic_Supplier_Command::TAO_NS_Periodic_Supplier_Command (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
 {
 }
 
-TAO_NS_Periodic_Supplier_Command::~TAO_NS_Periodic_Supplier_Command ()
+TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_Command ()
 {
 }
 
 const char*
-TAO_NS_Periodic_Supplier_Command::get_name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void)
 {
-  return TAO_NS_Periodic_Supplier_Command::name ();
+  return TAO_Notify_Tests_Periodic_Supplier_Command::name ();
 }
 
 const char*
-TAO_NS_Periodic_Supplier_Command::name (void)
+TAO_Notify_Tests_Periodic_Supplier_Command::name (void)
 {
-  return TAO_NS_Name::periodic_supplier_command;
+  return TAO_Notify_Tests_Name::periodic_supplier_command;
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -60,17 +60,17 @@ TAO_NS_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
               arg_shifter.consume_arg ();
             }
 
-          TAO_NS_Periodic_Supplier* supplier = 0;
+          TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
           // create the supplier
           if (is_direct == 1)
-            supplier = new TAO_NS_Direct_Supplier (direct_target);
+            supplier = new TAO_Notify_Tests_Direct_Supplier (direct_target);
           else
-            supplier = new TAO_NS_Periodic_Supplier ();
+            supplier = new TAO_Notify_Tests_Periodic_Supplier ();
 
           supplier->set_name (this->name_);
 
-         TAO_NS_Activation_Manager* act_mgr = 0;
+         TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
@@ -90,7 +90,7 @@ TAO_NS_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser options_parser;
+          TAO_Notify_Tests_Options_Parser options_parser;
           options_parser.execute (this->added_, this->removed_, arg_shifter);
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-Disconnect") == 0) //
@@ -130,20 +130,20 @@ TAO_NS_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     } /* if */
 }
 
-TAO_NS_Periodic_Supplier*
-TAO_NS_Periodic_Supplier_Command::supplier (void)
+TAO_Notify_Tests_Periodic_Supplier*
+TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
 {
-  TAO_NS_Activation_Manager* act_mgr = 0;
+  TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
   // Locate the supplier
-  TAO_NS_Periodic_Supplier* supplier = 0;
+  TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   act_mgr->resolve (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
@@ -156,9 +156,9 @@ TAO_NS_Periodic_Supplier_Command::supplier (void)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
@@ -169,9 +169,9 @@ TAO_NS_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
@@ -180,9 +180,9 @@ TAO_NS_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier= this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier ();
   if (supplier == 0)
     return;
 
@@ -191,9 +191,9 @@ TAO_NS_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
@@ -202,9 +202,9 @@ TAO_NS_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
   if (supplier == 0)
     return;
@@ -213,9 +213,9 @@ TAO_NS_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+  TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
   if (supplier == 0)
     return;
@@ -224,7 +224,7 @@ TAO_NS_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 7830c6d884d..f6da7cad4cc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PERIODICSUPPLIER_COMMAND_H
-#define TAO_NS_PERIODICSUPPLIER_COMMAND_H
+#ifndef TAO_Notify_Tests_PERIODICSUPPLIER_COMMAND_H
+#define TAO_Notify_Tests_PERIODICSUPPLIER_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -23,22 +23,22 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
 
-class TAO_NS_Periodic_Supplier;
+class TAO_Notify_Tests_Periodic_Supplier;
 
 /**
- * @class TAO_NS_Periodic_Supplier_Command
+ * @class TAO_Notify_Tests_Periodic_Supplier_Command
  *
  * @brief Command for Periodic Suppliers.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Periodic_Supplier_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_Periodic_Supplier_Command (void);
+  TAO_Notify_Tests_Periodic_Supplier_Command (void);
 
   /// Destructor
-  ~TAO_NS_Periodic_Supplier_Command ();
+  ~TAO_Notify_Tests_Periodic_Supplier_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -80,7 +80,7 @@ protected:
 
   ///= Methods
   // Retreive the suppliers.
-  TAO_NS_Periodic_Supplier* supplier (void);
+  TAO_Notify_Tests_Periodic_Supplier* supplier (void);
 
   ///= Handlers
   void handle_create (ACE_ENV_SINGLE_ARG_DECL);
@@ -92,4 +92,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_PERIODICSUPPLIER_COMMAND_H */
+#endif /* TAO_Notify_Tests_PERIODICSUPPLIER_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 00aea6b8315..57390f99b60 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -4,12 +4,12 @@
 
 ACE_RCSID(lib, Priority_Mapping, "$id$")
 
-TAO_NS_Priority_Mapping::~TAO_NS_Priority_Mapping (void)
+TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void)
 {
 }
 
 CORBA::Boolean
-TAO_NS_Priority_Mapping::to_native (CORBA::Short corba_priority,
+TAO_Notify_Tests_Priority_Mapping::to_native (CORBA::Short corba_priority,
                                  CORBA::Short &native_priority)
 {
   native_priority = corba_priority;
@@ -17,7 +17,7 @@ TAO_NS_Priority_Mapping::to_native (CORBA::Short corba_priority,
 }
 
 CORBA::Boolean
-TAO_NS_Priority_Mapping::to_CORBA (CORBA::Short native_priority,
+TAO_Notify_Tests_Priority_Mapping::to_CORBA (CORBA::Short native_priority,
                                 CORBA::Short &corba_priority)
 {
   corba_priority = native_priority;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
index 1c40eaa300c..32f30d2aa65 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PRIORITY_MAPPING_H
-#define TAO_NS_PRIORITY_MAPPING_H
+#ifndef TAO_Notify_Tests_PRIORITY_MAPPING_H
+#define TAO_Notify_Tests_PRIORITY_MAPPING_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,16 +22,16 @@
 #include "tao/corba.h"
 
 /**
- * @class TAO_NS_Priority_Mapping
+ * @class TAO_Notify_Tests_Priority_Mapping
  *
  * @brief A default Priority mapping. simply returns the same number.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Priority_Mapping
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Priority_Mapping
 {
 public:
   /// The destructor
-  virtual ~TAO_NS_Priority_Mapping (void);
+  virtual ~TAO_Notify_Tests_Priority_Mapping (void);
 
   virtual CORBA::Boolean
       to_native (CORBA::Short corba_priority,
@@ -42,4 +42,4 @@ public:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_PRIORITY_MAPPING_H */
+#endif /* TAO_Notify_Tests_PRIORITY_MAPPING_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index ead6d07fbe9..3cf25ce0922 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -8,42 +8,42 @@
 
 ACE_RCSID(lib, TAO_PushConsumer, "$id$")
 
-TAO_NS_PushConsumer_Traits::TAO_NS_PushConsumer_Traits (void)
+TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_PushConsumer::TAO_NS_PushConsumer (void)
+TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer (void)
 {
 }
 
-TAO_NS_PushConsumer::~TAO_NS_PushConsumer ()
+TAO_Notify_Tests_PushConsumer::~TAO_Notify_Tests_PushConsumer ()
 {
 }
 
 void
-TAO_NS_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_any_push_consumer (peer_ptr ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -54,12 +54,12 @@ TAO_NS_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_PushConsumer_Traits>;
-template class TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_PushConsumer_Traits>;
+template class TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_PushConsumer_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_PushConsumer_Traits>
-#pragma instantiate TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_PushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_PushConsumer_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 46a6094d304..e9910cd9021 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PUSHCONSUMER_H
-#define TAO_NS_PUSHCONSUMER_H
+#ifndef TAO_Notify_Tests_PUSHCONSUMER_H
+#define TAO_Notify_Tests_PUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Consumer_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_ProxyPushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ProxyPushSupplier_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::ProxyPushSupplier INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_PushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer_Traits
 {
 public:
-  TAO_NS_PushConsumer_Traits (void);
+  TAO_Notify_Tests_PushConsumer_Traits (void);
 
   typedef CosNotifyComm::PushConsumer INTERFACE;
   typedef CosNotifyComm::PushConsumer_ptr PTR;
   typedef CosNotifyComm::PushConsumer_var VAR;
   typedef POA_CosNotifyComm::PushConsumer SKELETON;
 
-  typedef TAO_NS_ProxyPushSupplier_Traits Proxy_Traits;
-  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
-  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_ProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits> TAO_NS_PushConsumer_Base;
+typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_PushConsumer_Traits> TAO_Notify_Tests_PushConsumer_Base;
 
 /**
- * @class TAO_NS_PushConsumer
+ * @class TAO_Notify_Tests_PushConsumer
  *
  * @brief PushConsumer implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_PushConsumer : public TAO_NS_PushConsumer_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_Tests_PushConsumer_Base
 {
-  typedef TAO_NS_PushConsumer_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_PushConsumer_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_PushConsumer (void);
+  TAO_Notify_Tests_PushConsumer (void);
 
   /// Destructor
-  virtual ~TAO_NS_PushConsumer ();
+  virtual ~TAO_Notify_Tests_PushConsumer ();
 
 protected:
   /// Connect to Peer.
@@ -101,4 +101,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PUSHCONSUMER_H */
+#endif /* TAO_Notify_Tests_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index cfd81bde610..86fe0a23683 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -8,23 +8,23 @@
 
 ACE_RCSID(lib, TAO_PushSupplier, "$id$")
 
-TAO_NS_PushSupplier_Traits::TAO_NS_PushSupplier_Traits (void)
+TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::ANY_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_PushSupplier::TAO_NS_PushSupplier (void)
+TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier (void)
 {
 }
 
-TAO_NS_PushSupplier::~TAO_NS_PushSupplier ()
+TAO_Notify_Tests_PushSupplier::~TAO_Notify_Tests_PushSupplier ()
 {
 }
 
 void
-TAO_NS_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
@@ -32,20 +32,20 @@ TAO_NS_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_any_push_supplier (peer_ptr
                                         ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -53,12 +53,12 @@ TAO_NS_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_PushSupplier_Traits>;
-template class TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_PushSupplier_Traits>;
+template class TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_PushSupplier_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_PushSupplier_Traits>
-#pragma instantiate TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_PushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_PushSupplier_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index b28c7ec4572..92f3393dd00 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_PUSHSUPPLIER_H
-#define TAO_NS_PUSHSUPPLIER_H
+#ifndef TAO_Notify_Tests_PUSHSUPPLIER_H
+#define TAO_Notify_Tests_PUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Supplier_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_ProxyPushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ProxyPushConsumer_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::ProxyPushConsumer INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_PushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier_Traits
 {
 public:
-  TAO_NS_PushSupplier_Traits (void);
+  TAO_Notify_Tests_PushSupplier_Traits (void);
 
   typedef CosNotifyComm::PushSupplier INTERFACE;
   typedef CosNotifyComm::PushSupplier_ptr PTR;
   typedef CosNotifyComm::PushSupplier_var VAR;
   typedef POA_CosNotifyComm::PushSupplier SKELETON;
 
-  typedef TAO_NS_ProxyPushConsumer_Traits Proxy_Traits;
-  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
-  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_ProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits> TAO_NS_PushSupplier_Base;
+typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_PushSupplier_Traits> TAO_Notify_Tests_PushSupplier_Base;
 
 /**
- * @class TAO_NS_PushSupplier
+ * @class TAO_Notify_Tests_PushSupplier
  *
  * @brief PushSupplier Implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_PushSupplier : public TAO_NS_PushSupplier_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_Tests_PushSupplier_Base
 {
-  typedef TAO_NS_PushSupplier_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_PushSupplier_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_PushSupplier (void);
+  TAO_Notify_Tests_PushSupplier (void);
 
   /// Destructor
-  virtual ~TAO_NS_PushSupplier ();
+  virtual ~TAO_Notify_Tests_PushSupplier ();
 
   /// Send one event.
   virtual void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
@@ -94,4 +94,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_PUSHSUPPLIER_H */
+#endif /* TAO_Notify_Tests_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/README b/TAO/orbsvcs/tests/Notify/lib/README
index ea2342a1f29..3e8a49d1c22 100644
--- a/TAO/orbsvcs/tests/Notify/lib/README
+++ b/TAO/orbsvcs/tests/Notify/lib/README
@@ -3,8 +3,8 @@
 This directory has the library used by the test examples to test the
 Notification Service.
 
-Helper classes TAO_Notify_StructuredPushConsumer,
-               TAO_Notify_StructuredPushSupplier,
-               TAO_Notify_PushConsumer,
-               TAO_Notify_PushSupplier,
+Helper classes TAO_Notify_Tests_StructuredPushConsumer,
+               TAO_Notify_Tests_StructuredPushSupplier,
+               TAO_Notify_Tests_PushConsumer,
+               TAO_Notify_Tests_PushSupplier,
 to help write client consumers and suppliers.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index c73d56293db..c78dacd7504 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -2,23 +2,23 @@
 
 #include "Relay_Consumer.h"
 
-ACE_RCSID(Notify, TAO_NS_Relay_Consumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Tests_Relay_Consumer, "$id$")
 
 #include "LookupManager.h"
 
-TAO_NS_Relay_Consumer::TAO_NS_Relay_Consumer (ACE_CString& destination)
+TAO_Notify_Tests_Relay_Consumer::TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination)
   : destination_ (destination)
 {
 }
 
-TAO_NS_Relay_Consumer::~TAO_NS_Relay_Consumer ()
+TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer ()
 {
 }
 
 void
-TAO_NS_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_NS_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resolve the destination object.
@@ -27,13 +27,13 @@ TAO_NS_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification
+TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification
                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
   // The Periodic Consumer will record the run statistics.
-  //TAO_NS_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+  //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
   //ACE_CHECK;
 
   // Forward the event.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index c85ae9f7326..441ab844518 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RELAY_CONSUMER_H
-#define TAO_NS_RELAY_CONSUMER_H
+#ifndef TAO_Notify_Tests_RELAY_CONSUMER_H
+#define TAO_Notify_Tests_RELAY_CONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -22,19 +22,19 @@
 #include "Direct_Consumer.h"
 
 /**
- * @class TAO_NS_Relay_Consumer
+ * @class TAO_Notify_Tests_Relay_Consumer
  *
  * @brief Relay events to a destination consumer.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Relay_Consumer : public TAO_NS_Direct_Consumer
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Relay_Consumer : public TAO_Notify_Tests_Direct_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_Relay_Consumer (ACE_CString& destination);
+  TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination);
 
   /// Destructor
-  ~TAO_NS_Relay_Consumer ();
+  ~TAO_Notify_Tests_Relay_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
   virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
@@ -53,4 +53,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_RELAY_CONSUMER_H */
+#endif /* TAO_Notify_Tests_RELAY_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index aef188a6e7b..0013c7a3950 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -8,43 +8,43 @@
 
 ACE_RCSID(lib, TAO_SequencePushConsumer, "$id$")
 
-TAO_NS_SequencePushConsumer_Traits::TAO_NS_SequencePushConsumer_Traits (void)
+TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_SequencePushConsumer::TAO_NS_SequencePushConsumer (void)
+TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer (void)
 {
 }
 
-TAO_NS_SequencePushConsumer::~TAO_NS_SequencePushConsumer ()
+TAO_Notify_Tests_SequencePushConsumer::~TAO_Notify_Tests_SequencePushConsumer ()
 {
 }
 
 void
-TAO_NS_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_sequence_push_consumer (peer_ptr
                                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushConsumer::push_structured_events
+TAO_Notify_Tests_SequencePushConsumer::push_structured_events
    (const CosNotification::EventBatch &/*notifications*/
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -55,12 +55,12 @@ TAO_NS_SequencePushConsumer::push_structured_events
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_SequencePushConsumer_Traits>;
-template class TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_SequencePushConsumer_Traits>;
+template class TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_SequencePushConsumer_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_SequencePushConsumer_Traits>
-#pragma instantiate TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_SequencePushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_SequencePushConsumer_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 014f4d24e9b..f652a666991 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPUSHCONSUMER_H
-#define TAO_NS_SEQUENCEPUSHCONSUMER_H
+#ifndef TAO_Notify_Tests_SEQUENCEPUSHCONSUMER_H
+#define TAO_Notify_Tests_SEQUENCEPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Consumer_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_SequenceProxyPushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequenceProxyPushSupplier_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::SequenceProxyPushSupplier INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer_Traits
 {
 public:
-  TAO_NS_SequencePushConsumer_Traits (void);
+  TAO_Notify_Tests_SequencePushConsumer_Traits (void);
 
   typedef CosNotifyComm::SequencePushConsumer INTERFACE;
   typedef CosNotifyComm::SequencePushConsumer_ptr PTR;
   typedef CosNotifyComm::SequencePushConsumer_var VAR;
   typedef POA_CosNotifyComm::SequencePushConsumer SKELETON;
 
-  typedef TAO_NS_SequenceProxyPushSupplier_Traits Proxy_Traits;
-  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
-  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_SequenceProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits> TAO_NS_SequencePushConsumer_Base;
+typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_SequencePushConsumer_Traits> TAO_Notify_Tests_SequencePushConsumer_Base;
 
 /**
- * @class TAO_NS_SequencePushConsumer
+ * @class TAO_Notify_Tests_SequencePushConsumer
  *
  * @brief SequencePushConsumer Implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushConsumer : public TAO_NS_SequencePushConsumer_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer_Base
 {
-  typedef TAO_NS_SequencePushConsumer_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_SequencePushConsumer_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_SequencePushConsumer (void);
+  TAO_Notify_Tests_SequencePushConsumer (void);
 
   /// Destructor
-  virtual ~TAO_NS_SequencePushConsumer ();
+  virtual ~TAO_Notify_Tests_SequencePushConsumer ();
 
 protected:
   /// Connect to Peer.
@@ -101,4 +101,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPUSHCONSUMER_H */
+#endif /* TAO_Notify_Tests_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 4a8f32688d3..21547b8850e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -8,23 +8,23 @@
 
 ACE_RCSID(lib, TAO_SequencePushSupplier, "$id$")
 
-TAO_NS_SequencePushSupplier_Traits::TAO_NS_SequencePushSupplier_Traits (void)
+TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_SequencePushSupplier::TAO_NS_SequencePushSupplier (void)
+TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier (void)
 {
 }
 
-TAO_NS_SequencePushSupplier::~TAO_NS_SequencePushSupplier ()
+TAO_Notify_Tests_SequencePushSupplier::~TAO_Notify_Tests_SequencePushSupplier ()
 {
 }
 
 void
-TAO_NS_SequencePushSupplier::send_events (const CosNotification::EventBatch& events
+TAO_Notify_Tests_SequencePushSupplier::send_events (const CosNotification::EventBatch& events
                                           ACE_ENV_ARG_DECL
                                           )
 {
@@ -34,20 +34,20 @@ TAO_NS_SequencePushSupplier::send_events (const CosNotification::EventBatch& eve
 }
 
 void
-TAO_NS_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_sequence_push_supplier (peer_ptr
                                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -56,12 +56,12 @@ TAO_NS_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_A
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_SequencePushSupplier_Traits>;
-template class TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_SequencePushSupplier_Traits>;
+template class TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_SequencePushSupplier_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_SequencePushSupplier_Traits>
-#pragma instantiate TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_SequencePushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_SequencePushSupplier_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index b889287da36..23c7b9cc507 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SEQUENCEPUSHSUPPLIER_H
-#define TAO_NS_SEQUENCEPUSHSUPPLIER_H
+#ifndef TAO_Notify_Tests_SEQUENCEPUSHSUPPLIER_H
+#define TAO_Notify_Tests_SEQUENCEPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Supplier_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_SequenceProxyPushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequenceProxyPushConsumer_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::SequenceProxyPushConsumer INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier_Traits
 {
 public:
-  TAO_NS_SequencePushSupplier_Traits (void);
+  TAO_Notify_Tests_SequencePushSupplier_Traits (void);
 
   typedef CosNotifyComm::SequencePushSupplier INTERFACE;
   typedef CosNotifyComm::SequencePushSupplier_ptr PTR;
   typedef CosNotifyComm::SequencePushSupplier_var VAR;
   typedef POA_CosNotifyComm::SequencePushSupplier SKELETON;
 
-  typedef TAO_NS_SequenceProxyPushConsumer_Traits Proxy_Traits;
-  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
-  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_SequenceProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits> TAO_NS_SequencePushSupplier_Base;
+typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_SequencePushSupplier_Traits> TAO_Notify_Tests_SequencePushSupplier_Base;
 
 /**
- * @class TAO_NS_SequencePushSupplier
+ * @class TAO_Notify_Tests_SequencePushSupplier
  *
  * @brief SequencePushSupplier Implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushSupplier : public TAO_NS_SequencePushSupplier_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier_Base
 {
-  typedef TAO_NS_SequencePushSupplier_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_SequencePushSupplier_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_SequencePushSupplier (void);
+  TAO_Notify_Tests_SequencePushSupplier (void);
 
   /// Destructor
-  virtual ~TAO_NS_SequencePushSupplier ();
+  virtual ~TAO_Notify_Tests_SequencePushSupplier ();
 
   /// Send one event.
   virtual void send_events (const CosNotification::EventBatch& events
@@ -95,4 +95,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SEQUENCEPUSHSUPPLIER_H */
+#endif /* TAO_Notify_Tests_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index a19c1b84a5c..d0de3eb8249 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -2,28 +2,28 @@
 
 #include "StructuredEvent.h"
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredEvent, "$id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Tests_StructuredEvent, "$id$")
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (void)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void)
 {
 }
 
-TAO_NS_StructuredEvent::~TAO_NS_StructuredEvent ()
+TAO_Notify_Tests_StructuredEvent::~TAO_Notify_Tests_StructuredEvent ()
 {
 }
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const char* name)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (const char* name)
 {
   event_.header.fixed_header.event_name = CORBA::string_dup(name);
 }
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const char* domain, const char* type)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type)
 {
   event_.header.fixed_header.event_type.domain_name = CORBA::string_dup(domain);
   event_.header.fixed_header.event_type.type_name = CORBA::string_dup(type);
 }
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const char* name, const char* domain, const char* type)
+TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (const char* name, const char* domain, const char* type)
 {
   event_.header.fixed_header.event_name = CORBA::string_dup(name);
   event_.header.fixed_header.event_type.domain_name = CORBA::string_dup(domain);
@@ -31,26 +31,26 @@ TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const char* name, const char* do
 }
 
 void
-TAO_NS_StructuredEvent::name (const char* name)
+TAO_Notify_Tests_StructuredEvent::name (const char* name)
 {
   event_.header.fixed_header.event_name = CORBA::string_dup(name);
 }
 
 void
-TAO_NS_StructuredEvent::type (const char* domain, const char* type)
+TAO_Notify_Tests_StructuredEvent::type (const char* domain, const char* type)
 {
   event_.header.fixed_header.event_type.domain_name = CORBA::string_dup(domain);
   event_.header.fixed_header.event_type.type_name = CORBA::string_dup(type);
 }
 
 const char*
-TAO_NS_StructuredEvent::type (void)
+TAO_Notify_Tests_StructuredEvent::type (void)
 {
   return event_.header.fixed_header.event_type.type_name;
 }
 
 void
-TAO_NS_StructuredEvent::opt_header (const char* name, CORBA::Any& value)
+TAO_Notify_Tests_StructuredEvent::opt_header (const char* name, CORBA::Any& value)
 {
   CosNotification::PropertySeq& opt =  event_.header.variable_header;
   opt.length (opt.length () + 1);
@@ -60,7 +60,7 @@ TAO_NS_StructuredEvent::opt_header (const char* name, CORBA::Any& value)
 }
 
 void
-TAO_NS_StructuredEvent::filter (const char* name, CORBA::Any& value)
+TAO_Notify_Tests_StructuredEvent::filter (const char* name, CORBA::Any& value)
 {
   CosNotification::PropertySeq& filter = event_.filterable_data;
   filter.length (filter.length () + 1);
@@ -70,19 +70,19 @@ TAO_NS_StructuredEvent::filter (const char* name, CORBA::Any& value)
 }
 
 void
-TAO_NS_StructuredEvent::qos (const char* name, CORBA::Any& value)
+TAO_Notify_Tests_StructuredEvent::qos (const char* name, CORBA::Any& value)
 {
   this->opt_header (name, value);
 }
 
 void
-TAO_NS_StructuredEvent::payload (CORBA::Any& value)
+TAO_Notify_Tests_StructuredEvent::payload (CORBA::Any& value)
 {
   event_.remainder_of_body = value;
 }
 
 CosNotification::StructuredEvent&
-TAO_NS_StructuredEvent::event (void)
+TAO_Notify_Tests_StructuredEvent::event (void)
 {
   return this->event_;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index e88d5bb349a..e0967228f30 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDEVENT_H
-#define TAO_NS_STRUCTUREDEVENT_H
+#ifndef TAO_Notify_Tests_STRUCTUREDEVENT_H
+#define TAO_Notify_Tests_STRUCTUREDEVENT_H
 
 #include "ace/pre.h"
 #include "notify_test_export.h"
@@ -22,22 +22,22 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_StructuredEvent
+ * @class TAO_Notify_Tests_StructuredEvent
  *
  * @brief Helper class to populate a CosNotification::StructuredEvent.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredEvent
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent (void);
-  TAO_NS_StructuredEvent (const char* name);
-  TAO_NS_StructuredEvent (const char* domain, const char* type);
-  TAO_NS_StructuredEvent (const char* name, const char* domain, const char* type);
+  TAO_Notify_Tests_StructuredEvent (void);
+  TAO_Notify_Tests_StructuredEvent (const char* name);
+  TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type);
+  TAO_Notify_Tests_StructuredEvent (const char* name, const char* domain, const char* type);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent ();
+  ~TAO_Notify_Tests_StructuredEvent ();
 
   void name (const char* name);
   void type (const char* domain, const char* type);
@@ -64,4 +64,4 @@ private:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDEVENT_H */
+#endif /* TAO_Notify_Tests_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index 10f85775fb3..f43bd3f1dcc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -8,43 +8,43 @@
 
 ACE_RCSID(lib, TAO_StructuredPushConsumer, "$id$")
 
-TAO_NS_StructuredPushConsumer_Traits::TAO_NS_StructuredPushConsumer_Traits (void)
+TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_StructuredPushConsumer::TAO_NS_StructuredPushConsumer (void)
+TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer (void)
 {
 }
 
-TAO_NS_StructuredPushConsumer::~TAO_NS_StructuredPushConsumer ()
+TAO_Notify_Tests_StructuredPushConsumer::~TAO_Notify_Tests_StructuredPushConsumer ()
 {
 }
 
 void
-TAO_NS_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_structured_push_consumer (peer_ptr
                                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push_structured_event
+TAO_Notify_Tests_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent &/*notification*/
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -55,12 +55,12 @@ TAO_NS_StructuredPushConsumer::push_structured_event
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_StructuredPushConsumer_Traits>;
-template class TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_StructuredPushConsumer_Traits>;
+template class TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_StructuredPushConsumer_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_StructuredPushConsumer_Traits>
-#pragma instantiate TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_StructuredPushConsumer_Traits>
+#pragma instantiate TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_StructuredPushConsumer_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 1b651f4f3ad..444044d2729 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHCONSUMER_H
-#define TAO_NS_STRUCTUREDPUSHCONSUMER_H
+#ifndef TAO_Notify_Tests_STRUCTUREDPUSHCONSUMER_H
+#define TAO_Notify_Tests_STRUCTUREDPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Consumer_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredProxyPushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredProxyPushSupplier_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::StructuredProxyPushSupplier INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer_Traits
 {
 public:
-  TAO_NS_StructuredPushConsumer_Traits (void);
+  TAO_Notify_Tests_StructuredPushConsumer_Traits (void);
 
   typedef CosNotifyComm::StructuredPushConsumer INTERFACE;
   typedef CosNotifyComm::StructuredPushConsumer_ptr PTR;
   typedef CosNotifyComm::StructuredPushConsumer_var VAR;
   typedef POA_CosNotifyComm::StructuredPushConsumer SKELETON;
 
-  typedef TAO_NS_StructuredProxyPushSupplier_Traits Proxy_Traits;
-  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
-  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_StructuredProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits> TAO_NS_StructuredPushConsumer_Base;
+typedef TAO_Notify_Tests_Consumer_T<TAO_Notify_Tests_StructuredPushConsumer_Traits> TAO_Notify_Tests_StructuredPushConsumer_Base;
 
 /**
- * @class TAO_NS_StructuredPushConsumer
+ * @class TAO_Notify_Tests_StructuredPushConsumer
  *
  * @brief StructuredPushConsumer Implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushConsumer : public TAO_NS_StructuredPushConsumer_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer_Base
 {
-  typedef TAO_NS_StructuredPushConsumer_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_StructuredPushConsumer_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredPushConsumer (void);
+  TAO_Notify_Tests_StructuredPushConsumer (void);
 
   /// Destructor
-  virtual ~TAO_NS_StructuredPushConsumer ();
+  virtual ~TAO_Notify_Tests_StructuredPushConsumer ();
 
 protected:
   /// Connect to Peer.
@@ -101,4 +101,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHCONSUMER_H */
+#endif /* TAO_Notify_Tests_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index 3aa8f990f7a..615ceb6d312 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -8,23 +8,23 @@
 
 ACE_RCSID(lib, TAO_StructuredPushSupplier, "$id$")
 
-TAO_NS_StructuredPushSupplier_Traits::TAO_NS_StructuredPushSupplier_Traits (void)
+TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void)
   :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
 {
 }
 
 /*******************************************************************/
 
-TAO_NS_StructuredPushSupplier::TAO_NS_StructuredPushSupplier (void)
+TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier (void)
 {
 }
 
-TAO_NS_StructuredPushSupplier::~TAO_NS_StructuredPushSupplier ()
+TAO_Notify_Tests_StructuredPushSupplier::~TAO_Notify_Tests_StructuredPushSupplier ()
 {
 }
 
 void
-TAO_NS_StructuredPushSupplier::send_event (
+TAO_Notify_Tests_StructuredPushSupplier::send_event (
     const CosNotification::StructuredEvent& event
     ACE_ENV_ARG_DECL
   )
@@ -35,20 +35,20 @@ TAO_NS_StructuredPushSupplier::send_event (
 }
 
 void
-TAO_NS_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
 {
   proxy_ptr->connect_structured_push_supplier (peer_ptr
                                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -56,12 +56,12 @@ TAO_NS_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SING
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_NS_Peer_T<TAO_NS_StructuredPushSupplier_Traits>;
-template class TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits>;
+template class TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_StructuredPushSupplier_Traits>;
+template class TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_StructuredPushSupplier_Traits>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_NS_Peer_T<TAO_NS_StructuredPushSupplier_Traits>
-#pragma instantiate TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Peer_T<TAO_Notify_Tests_StructuredPushSupplier_Traits>
+#pragma instantiate TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_StructuredPushSupplier_Traits>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 1ec19a7c025..5fae7071fc6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHSUPPLIER_H
-#define TAO_NS_STRUCTUREDPUSHSUPPLIER_H
+#ifndef TAO_Notify_Tests_STRUCTUREDPUSHSUPPLIER_H
+#define TAO_Notify_Tests_STRUCTUREDPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,7 +24,7 @@
 
 #include "Supplier_T.h"
 
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredProxyPushConsumer_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredProxyPushConsumer_Traits
 {
 public:
   typedef CosNotifyChannelAdmin::StructuredProxyPushConsumer INTERFACE;
@@ -33,44 +33,44 @@ public:
   typedef CosNotifyChannelAdmin::ProxyID ID;
 };
 
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushSupplier_Traits
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier_Traits
 {
 public:
-  TAO_NS_StructuredPushSupplier_Traits (void);
+  TAO_Notify_Tests_StructuredPushSupplier_Traits (void);
 
   typedef CosNotifyComm::StructuredPushSupplier INTERFACE;
   typedef CosNotifyComm::StructuredPushSupplier_ptr PTR;
   typedef CosNotifyComm::StructuredPushSupplier_var VAR;
   typedef POA_CosNotifyComm::StructuredPushSupplier SKELETON;
 
-  typedef TAO_NS_StructuredProxyPushConsumer_Traits Proxy_Traits;
-  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
-  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+  typedef TAO_Notify_Tests_StructuredProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_Notify_Tests_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
 
   const CosNotifyChannelAdmin::ClientType type_;
 };
 
-typedef TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits> TAO_NS_StructuredPushSupplier_Base;
+typedef TAO_Notify_Tests_Supplier_T<TAO_Notify_Tests_StructuredPushSupplier_Traits> TAO_Notify_Tests_StructuredPushSupplier_Base;
 
 /**
- * @class TAO_NS_StructuredPushSupplier
+ * @class TAO_Notify_Tests_StructuredPushSupplier
  *
  * @brief StructuredPushSupplier Implementation.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushSupplier : public TAO_NS_StructuredPushSupplier_Base
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier_Base
 {
-  typedef TAO_NS_StructuredPushSupplier_Traits Peer_Traits;
+  typedef TAO_Notify_Tests_StructuredPushSupplier_Traits Peer_Traits;
   typedef Peer_Traits::Admin_Traits Admin_Traits;
   typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredPushSupplier (void);
+  TAO_Notify_Tests_StructuredPushSupplier (void);
 
   /// Destructor
-  virtual ~TAO_NS_StructuredPushSupplier ();
+  virtual ~TAO_Notify_Tests_StructuredPushSupplier ();
 
   /// Send one event.
   virtual void send_event (const CosNotification::StructuredEvent& event
@@ -95,4 +95,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHSUPPLIER_H */
+#endif /* TAO_Notify_Tests_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index eaea60be1c8..8baf36acadc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -8,29 +8,29 @@ ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$id$")
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_NS_SupplierAdmin_Command::TAO_NS_SupplierAdmin_Command (void)
+TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command (void)
 : ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
 
-TAO_NS_SupplierAdmin_Command::~TAO_NS_SupplierAdmin_Command ()
+TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command ()
 {
 }
 
 const char*
-TAO_NS_SupplierAdmin_Command::get_name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::get_name (void)
 {
-  return TAO_NS_SupplierAdmin_Command::name ();
+  return TAO_Notify_Tests_SupplierAdmin_Command::name ();
 }
 
 const char*
-TAO_NS_SupplierAdmin_Command::name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::name (void)
 {
-  return TAO_NS_Name::supplier_admin_command;
+  return TAO_Notify_Tests_Name::supplier_admin_command;
 }
 
 void
-TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -70,7 +70,7 @@ TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser options_parser;
+          TAO_Notify_Tests_Options_Parser options_parser;
           options_parser.execute (this->added_, this->removed_, arg_shifter);
         } // Subscription
       else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS ec_name [Qos Options]
@@ -83,14 +83,14 @@ TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     } /* if */
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -109,7 +109,7 @@ TAO_NS_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -137,12 +137,12 @@ TAO_NS_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -154,7 +154,7 @@ TAO_NS_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index a8e0dfa8da8..28d8576593b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIERADMIN_COMMAND_H
-#define TAO_NS_SUPPLIERADMIN_COMMAND_H
+#ifndef TAO_Notify_Tests_SUPPLIERADMIN_COMMAND_H
+#define TAO_Notify_Tests_SUPPLIERADMIN_COMMAND_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -24,19 +24,19 @@
 #include "Command.h"
 
 /**
- * @class TAO_NS_SupplierAdmin_Command
+ * @class TAO_Notify_Tests_SupplierAdmin_Command
  *
  * @brief Command for Supplier Admins.
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_SupplierAdmin_Command : public TAO_NS_Command
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO_Notify_Tests_Command
 {
 public:
   /// Constuctor
-  TAO_NS_SupplierAdmin_Command (void);
+  TAO_Notify_Tests_SupplierAdmin_Command (void);
 
   /// Destructor
-  ~TAO_NS_SupplierAdmin_Command ();
+  ~TAO_Notify_Tests_SupplierAdmin_Command ();
 
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
@@ -86,4 +86,4 @@ protected:
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIERADMIN_COMMAND_H */
+#endif /* TAO_Notify_Tests_SUPPLIERADMIN_COMMAND_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index bcd432d8c10..4c1201c72b2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef TAO_NS_Supplier_T_CPP
-#define TAO_NS_Supplier_T_CPP
+#ifndef TAO_Notify_Tests_Supplier_T_CPP
+#define TAO_Notify_Tests_Supplier_T_CPP
 
 #include "Supplier_T.h"
 
@@ -8,26 +8,26 @@
 #include "Supplier_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_Supplier_T, "$id$")
+ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$id$")
 
 template <class Supplier_Traits>
-TAO_NS_Supplier_T<Supplier_Traits>::TAO_NS_Supplier_T (void)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void)
 {
 }
 
 template <class Supplier_Traits>
-TAO_NS_Supplier_T<Supplier_Traits>::~TAO_NS_Supplier_T ()
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T ()
 {
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_NS_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
+template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
 {
   return this->get_proxy ();
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
 {
   Supplier_Traits traits;
 
@@ -45,8 +45,8 @@ TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Supplier_T
   ACE_ENV_ARG_PARAMETER);
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
+template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
                                              , CosNotification::QoSProperties& qos
                                              ACE_ENV_ARG_DECL)
 {
@@ -67,7 +67,7 @@ TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_NS_Supplier_T
 }
 
 template <class Supplier_Traits> void
-TAO_NS_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
@@ -93,7 +93,7 @@ TAO_NS_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq
 }
 
 template <class Supplier_Traits> void
-TAO_NS_Supplier_T<Supplier_Traits>::subscription_change (
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change (
                                                          const CosNotification::EventTypeSeq & /*added*/,
                                                          const CosNotification::EventTypeSeq & /*removed*/
         ACE_ENV_ARG_DECL_NOT_USED
@@ -105,4 +105,4 @@ TAO_NS_Supplier_T<Supplier_Traits>::subscription_change (
 {
   // No op.
 }
-#endif /* TAO_NS_Supplier_T_CPP */
+#endif /* TAO_Notify_Tests_Supplier_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 70ac1c1351c..abf72e061fe 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_SUPPLIER_T_H
-#define TAO_NS_SUPPLIER_T_H
+#ifndef TAO_Notify_Tests_SUPPLIER_T_H
+#define TAO_Notify_Tests_SUPPLIER_T_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -21,7 +21,7 @@
 
 #include "Peer_T.h"
 
-class TAO_NS_SupplierAdmin_Traits
+class TAO_Notify_Tests_SupplierAdmin_Traits
 {
  public:
   typedef CosNotifyChannelAdmin::SupplierAdmin INTERFACE;
@@ -29,7 +29,7 @@ class TAO_NS_SupplierAdmin_Traits
   typedef CosNotifyChannelAdmin::SupplierAdmin_var VAR;
 };
 
-class TAO_NS_SupplierAdmin_Ext_Traits
+class TAO_Notify_Tests_SupplierAdmin_Ext_Traits
 {
  public:
   typedef NotifyExt::SupplierAdmin INTERFACE;
@@ -38,13 +38,13 @@ class TAO_NS_SupplierAdmin_Ext_Traits
 };
 
 /**
- * @class TAO_NS_Supplier_T
+ * @class TAO_Notify_Tests_Supplier_T
  *
  * @brief Base template to implement Suppliers.
  *
  */
 template <class Supplier_Traits>
-class TAO_NOTIFY_TEST_Export TAO_NS_Supplier_T : public TAO_NS_Peer_T <Supplier_Traits>
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Traits>
 {
   typedef ACE_TYPENAME Supplier_Traits::Admin_Traits Admin_Traits;
   typedef ACE_TYPENAME Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits;
@@ -57,10 +57,10 @@ class TAO_NOTIFY_TEST_Export TAO_NS_Supplier_T : public TAO_NS_Peer_T <Supplier_
 
 public:
   /// Constuctor
-  TAO_NS_Supplier_T (void);
+  TAO_Notify_Tests_Supplier_T (void);
 
   /// Destructor
-  ~TAO_NS_Supplier_T ();
+  ~TAO_Notify_Tests_Supplier_T ();
 
   /// For backward compatibility. use <get_proxy> instead.
   Proxy_Traits_PTR get_proxy_consumer (void);
@@ -102,4 +102,4 @@ protected:
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include "ace/post.h"
-#endif /* TAO_NS_SUPPLIER_T_H */
+#endif /* TAO_Notify_Tests_SUPPLIER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
index dbf5fcf5d85..2ff48b4f056 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_TASK_CALLBACK_H
-#define TAO_NS_TASK_CALLBACK_H
+#ifndef TAO_Notify_Tests_TASK_CALLBACK_H
+#define TAO_Notify_Tests_TASK_CALLBACK_H
 #include "ace/pre.h"
 
 #include "notify_test_export.h"
@@ -19,21 +19,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_NS_Periodic_Supplier;
-class TAO_NS_Periodic_Consumer;
+class TAO_Notify_Tests_Periodic_Supplier;
+class TAO_Notify_Tests_Periodic_Consumer;
 
 /**
- * @class TAO_NS_Task_Callback
+ * @class TAO_Notify_Tests_Task_Callback
  *
  * @brief
  *
  */
-class TAO_NOTIFY_TEST_Export TAO_NS_Task_Callback
+class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Task_Callback
 {
 public:
-  virtual void done (TAO_NS_Periodic_Supplier* supplier) = 0;
-  virtual void done (TAO_NS_Periodic_Consumer* consumer) = 0;
+  virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier) = 0;
+  virtual void done (TAO_Notify_Tests_Periodic_Consumer* consumer) = 0;
 };
 
 #include "ace/post.h"
-#endif /* TAO_NS_TASK_CALLBACK_H */
+#endif /* TAO_Notify_Tests_TASK_CALLBACK_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index 9444f8ac373..42e7663f17e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -20,7 +20,7 @@
 
 #include "Notify_SequencePushConsumer.h"
 
-class Notify_Sequence_Push_Consumer : public TAO_Notify_SequencePushConsumer
+class Notify_Sequence_Push_Consumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   Notify_Sequence_Push_Consumer (const char* name,
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index 87aa71542bd..c2a9ba31d6f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -21,7 +21,7 @@
 #include "Notify_StructuredPushConsumer.h"
 
 
-class Notify_Structured_Push_Consumer : public TAO_Notify_StructuredPushConsumer
+class Notify_Structured_Push_Consumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Notify_Structured_Push_Consumer (
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 2b1f2bfd13a..124dca8a155 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -20,7 +20,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_SequencePushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static int max_events = 50;  // 50 sets of 10
@@ -153,7 +153,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_SequencePushSupplier (),
+                    TAO_Notify_Tests_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
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 9d1ba070680..c3cc5ac0f4a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -20,7 +20,7 @@
 // Data Section
 // ******************************************************************
 
-static TAO_Notify_StructuredPushSupplier* supplier_1 = 0;
+static TAO_Notify_Tests_StructuredPushSupplier* supplier_1 = 0;
 static CORBA::Boolean done = 0;
 static CORBA::Boolean start = 0;
 static int max_events = 1000;
@@ -149,7 +149,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
-                    TAO_Notify_StructuredPushSupplier (),
+                    TAO_Notify_Tests_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
   supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index b76ce78b76b..27f51ab9134 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -314,7 +314,7 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
       ACE_NEW_RETURN (suppliers_[i],
                       Throughput_StructuredPushSupplier (this),
                       -1);
-      suppliers_[i]->TAO_Notify_StructuredPushSupplier::init (
+      suppliers_[i]->TAO_Notify_Tests_StructuredPushSupplier::init (
                          root_poa_.in ()
                          ACE_ENV_ARG_PARAMETER
                        );
@@ -426,7 +426,7 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->collocated_ec_ == 1)
     {
-      TAO_Notify_Service* notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NS_NOTIFICATION_SERVICE_NAME);
+      TAO_Notify_Service* notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
 
       if (notify_service == 0)
         {
@@ -505,7 +505,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i < this->supplier_count_; ++i)
     {
       suppliers_[i]->
-        TAO_Notify_StructuredPushSupplier::init (root_poa_.in ()
+        TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ()
                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 7129abc1c4b..12d22cdb51f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -59,7 +59,7 @@ private:
 class Notify_Throughput;
 
 class Throughput_StructuredPushConsumer
-  : public TAO_Notify_StructuredPushConsumer
+  : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Throughput_StructuredPushConsumer (Notify_Throughput *test_client);
@@ -100,7 +100,7 @@ protected:
 /***************************************************************************/
 
 class Throughput_StructuredPushSupplier
-  : public TAO_Notify_StructuredPushSupplier,
+  : public TAO_Notify_Tests_StructuredPushSupplier,
     public ACE_Task_Base
 {
 public:
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
index 467f717ae29..06b9f8d5024 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
index c51b6856b2c..4e3baed56e9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
index be6c56410e2..9f89a870954 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
index 6d80be1e2d0..77b76bbd5ad 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
index 9736af1a1ed..05075e0a0ca 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
index 94fef3cc7b5..34edacba60c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
index 36199047de2..d1cdd106f68 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
index 245a8320331..03a6d3fd661 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
index 24b22089f67..656e0179b3c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
index 3126c7e8c98..25c9a568511 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
index 2631ea386f9..b45223cd022 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
@@ -3,12 +3,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
index fadd9c30538..e090b186840 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/consumer.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 06d934e65cf..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""
+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 d7e0083e0eb..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_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/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
index de890478729..ca0c3c49430 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
index ae378b85790..20fc0d9ec55 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
index f92d61c30ee..2b675effd7f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
index d85c82c3849..3dde06aaee4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
index 750c1f35a2a..09c26cfd4c4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
index 02c7f5c25fa..f734e30cdd0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
index e2e1d5f7388..db9a288a90c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
index 03399baeb7e..3dac68069ae 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
index 68c48db29c0..a4c6e817e2d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
index de816f34ffd..e6b46d64e18 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
index 6f74e419628..df5a1146a6e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
index c7e431e41d2..38c71b2f4cd 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 06d934e65cf..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""
+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 d7e0083e0eb..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_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/2_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
index b8b9ae44aa4..24a4c11915e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
@@ -4,11 +4,11 @@
 # All priority values are for Linux
 #
 ##---- Load the Factories------
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
index 326d1a81c5a..cef7340e622 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
@@ -5,11 +5,11 @@
 #
 
 ##---- Load the Factories------
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
index b6406954e9c..6c695fe477a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
index b15e8ec7212..f6200a42068 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
index 9819b1e351f..90565f43675 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
index 2af45e411ee..a9c8f1cd29f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
@@ -6,11 +6,11 @@
 #
 ##---- Load the Factories------
 
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
index 9f4c913cee4..375b7ea1294 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
@@ -6,11 +6,11 @@
 #
 ##---- Load the Factories------
 
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
index 365519d4bb2..0d485effd14 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
@@ -5,11 +5,11 @@
 # All priority values are for Linux
 #
 ##---- Load the Factories------
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
index b6406954e9c..6c695fe477a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
index 216629f1fde..203e7ca05e4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
index 888f8ee6c17..61f8b96c914 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
@@ -5,12 +5,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 8debc531edc..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
@@ -7,17 +7,17 @@ dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNot
 
 ##---- Load the Factories------
 
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 f6f851c7296..7c144b3ae18 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,25 +2,25 @@
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""
+dynamic TAO_Notify_Tests_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Tests_Default_Factory () ""
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
 ##---- Load the Factories------
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
index 2a2c6d45b9e..1ba5cf1a9f7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
@@ -4,11 +4,11 @@
 # All priority values are for Linux
 #
 ##---- Load the Factories------
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
index f2edafed29c..1f1f223af0c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
@@ -5,13 +5,13 @@
 # All priority values are for Linux
 #
 ##---- Load the Factories------
-dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
index e4ba0495b9f..3935e19471c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
@@ -2,13 +2,13 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 d7e0083e0eb..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_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_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
index 69a17c4e9b3..a5343317b6d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
@@ -4,12 +4,12 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
index db08fb1fa53..8f41c7907d8 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_1/other_paths.conf
@@ -2,18 +2,18 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
index 420d420d285..b68e4c499bb 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
@@ -2,20 +2,20 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
index f7c4ad5b4ce..d1771005a06 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
@@ -2,20 +2,20 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
index 41fed3c50a1..b760fca7855 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
@@ -2,20 +2,20 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 06d934e65cf..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""
+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/high_path.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
index 09f7ae8cd25..c4fa5df2f43 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
@@ -2,20 +2,20 @@
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
+##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
 
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
 
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
 
-dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
 
-dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
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 d7e0083e0eb..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_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_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 () ""