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

77 files changed, 932 insertions, 882 deletions

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 */