11 files changed, 13 insertions, 11 deletions
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index 15f12eb3e58..9a0cd8b6c22 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -31,7 +31,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
 #include "Consumer_Input_Handler.h"
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index f9b1a091ed6..9f5279a815b 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -23,7 +23,7 @@
 #include "NotifierS.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 
 class Notifier_Input_Handler : public ACE_Event_Handler
 {
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index ade4be29bc2..2753e58c776 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -19,7 +19,7 @@
 #ifndef SUPPLIER_I_H
 #define SUPPLIER_I_H
 
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Reactor.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index f4b031644d5..b7bee482f35 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -23,7 +23,7 @@
 #define _CONSUMER_HANDLER_H
 
 #include "Event_Comm_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
 class Consumer_Handler
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index 93cbe0a02c8..103664a4756 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
 class Notifier_Handler
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index e5f3f38b8e1..bbb1880c33a 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -20,7 +20,7 @@
 #include "Event_Comm_i.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 
 class Notifier_Server
 {
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index bc70c520427..e0916ad81ed 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -33,7 +33,7 @@
 #include "ace/OS.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 #include "Logger_i.h"
 #include "LoggerS.h"
 #include "LoggerC.h"
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 05ad3ea7a89..781c55a7b4f 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -30,7 +30,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "LoggerC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
 
 class Logger_Client
 {
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index fe681790c66..880be8f44c6 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -29,7 +29,7 @@
 
 #include "ace/Log_Msg.h"
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "Quoter_i.h"
 #include "QuoterC.h"
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 2c499cfda05..7a77efe0117 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -2,7 +2,8 @@
 #ifndef STARTER_H
 #define STARTER_H
 
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 #include "SynchC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 05336bb5f42..543f6dca5e0 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -20,7 +20,8 @@
 #define TAO_UTIL_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"