1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 082994f3511..03418434f75 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_WORKER_TASK_H
-#define TAO_NS_WORKER_TASK_H
+#ifndef TAO_Notify_WORKER_TASK_H
+#define TAO_Notify_WORKER_TASK_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -22,13 +22,13 @@
 #include "Method_Request.h"
 #include "Refcountable.h"
 
-class TAO_NS_AdminProperties;
-class TAO_NS_QoSProperties;
-class TAO_NS_Timer;
-class TAO_NS_Buffering_Strategy;
+class TAO_Notify_AdminProperties;
+class TAO_Notify_QoSProperties;
+class TAO_Notify_Timer;
+class TAO_Notify_Buffering_Strategy;
 
 /**
- * @class TAO_NS_Worker_Task
+ * @class TAO_Notify_Worker_Task
  *
  * @brief Base Worker Task.
  *
@@ -36,30 +36,30 @@ class TAO_NS_Buffering_Strategy;
  * the <shutdown> method should be called to release memory.
  *
  */
-class TAO_Notify_Export TAO_NS_Worker_Task : public TAO_NS_Refcountable
+class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable
 {
 public:
   /// Constuctor
-  TAO_NS_Worker_Task (void);
+  TAO_Notify_Worker_Task (void);
 
   /// Update QoS Properties.
-  virtual void update_qos_properties (const TAO_NS_QoSProperties& qos_properties);
+  virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
+  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
 
   /// The object used by clients to register timers.
-  virtual TAO_NS_Timer* timer (void) = 0;
+  virtual TAO_Notify_Timer* timer (void) = 0;
 
-  virtual TAO_NS_Buffering_Strategy* buffering_strategy (void) = 0;
+  virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void) = 0;
 
 protected:
   /// Destructor
-  virtual ~TAO_NS_Worker_Task ();
+  virtual ~TAO_Notify_Worker_Task ();
 };
 
 #if defined (__ACE_INLINE__)
@@ -67,4 +67,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_WORKER_TASK_H */
+#endif /* TAO_Notify_WORKER_TASK_H */