1 files changed, 17 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index f0d3ec1a54f..574865e5ba5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_CONSUMER_H
-#define TAO_NS_CONSUMER_H
+#ifndef TAO_Notify_CONSUMER_H
+#define TAO_Notify_CONSUMER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -24,35 +24,35 @@
 #include "Peer.h"
 #include "Event.h"
 
-class TAO_NS_ProxySupplier;
-class TAO_NS_Proxy;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_Proxy;
 
 /**
- * @class TAO_NS_Consumer
+ * @class TAO_Notify_Consumer
  *
  * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel
  *
  */
-class TAO_Notify_Export TAO_NS_Consumer : public TAO_NS_Peer
+class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer
 {
 public:
   /// Constuctor
-  TAO_NS_Consumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Destructor
-  virtual ~TAO_NS_Consumer ();
+  virtual ~TAO_Notify_Consumer ();
 
   /// Access Specific Proxy.
-  TAO_NS_ProxySupplier* proxy_supplier (void);
+  TAO_Notify_ProxySupplier* proxy_supplier (void);
 
   /// Access Base Proxy.
-  virtual TAO_NS_Proxy* proxy (void);
+  virtual TAO_Notify_Proxy* proxy (void);
 
   /// Push <event> to this consumer.
-  void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
-  void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL) = 0;
@@ -79,19 +79,19 @@ protected:
                                    ACE_ENV_ARG_DECL);
 
   /// Push Implementation.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL) = 0;
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) = 0;
 
   /// Push Implementation.
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL) = 0;
 
   /// Get the shared Proxy Lock
   TAO_SYNCH_MUTEX* proxy_lock (void);
 
   /// The Proxy that we associate with.
-  TAO_NS_ProxySupplier* proxy_;
+  TAO_Notify_ProxySupplier* proxy_;
 
   /// Events pending to be delivered.
-  TAO_NS_Event_Collection* event_collection_;
+  TAO_Notify_Event_Collection* event_collection_;
 
   /// Suspended Flag.
   CORBA::Boolean is_suspended_;
@@ -105,4 +105,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_CONSUMER_H */
+#endif /* TAO_Notify_CONSUMER_H */