Wed Sep 22 08:52:25 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:

        * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl:

        * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl:

        * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl:

        * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl:

        * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl:

        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl:

        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl:

        * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl:

        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:

        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl:

        * examples/BasicSP/descriptors/run_test.pl:

        * examples/Hello/descriptors/run_test.pl:
        * examples/Hello/descriptors/run_test_alias.pl:
        * examples/Hello/descriptors/run_test_shs.pl:

        * examples/Null_Component/descriptors/run_test.pl:

        * examples/Null_Component_Glfa/descriptors/run_test.pl:

        * tests/Bug_3769_Regression/descriptors/run_test.pl:

        * tests/Bug_3834_Regression/descriptors/run_test.pl:

        * tests/CIF/descriptors/run_test.pl:

        * tests/DAnCE/EM-Launch-Failures/run_test.pl:

        * tests/DAnCE/EM-Redeployment/run_test.pl:

        * tests/DAnCE/EM-Shutdown-Failures/run_test.pl:

        * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
        * tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl:

        * tests/DAnCE/Executor-Destructor/run_test.pl:

        * tests/DAnCE/LocalityManager/CPUAffinity/run_test.pl:

        * tests/DAnCE/LocalityManager/CommandlinePassage/run_test.pl:

        * tests/DAnCE/LocalityManager/UnexpectedShutdown/run_test.pl:

        * tests/DAnCE/NodeManager-Deployments/run_test.pl:
        * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl:

        * tests/DAnCE/Progressive_Deployments/run_test.pl:

        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:

        * tests/Thread/descriptors/run_test.pl:

        * tutorials/Quoter/Simple/descriptors/run_test.pl:
          Renamed 'Naming_Service' to 'tao_cosnaming'.

51 files changed, 51 insertions, 51 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
index ac96b017b94..7126aabaf23 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
@@ -138,7 +138,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
index 2ade949dc20..ff0b045fc13 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
index f9caf24ff9c..6cf5b6ec20c 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
index bfb5c2088ba..98dd121792e 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
index ce55d58a40f..c921219f6bd 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
index a6643af5534..e7b151a08fa 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
index e1edba771a6..88187b5065b 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
index 8573ab71d66..3afa6ab0d50 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
@@ -150,7 +150,7 @@ foreach $file (@files) {
 
     print STDERR "Starting Naming Service\n";
 
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
     $NS->Spawn ();
 
     if ($tg_naming->WaitForFileTimed ($ior_nsbase,
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
index ddf7fcbb1a0..0da80abf910 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
index a6643af5534..e7b151a08fa 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
index e653d5a6e50..d127c4fbf93 100755
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
index 2ade949dc20..ff0b045fc13 100755
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
index 6e029da4028..d834c418314 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
index 6e029da4028..d834c418314 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
index b4ae4f4368d..4a02e14d6da 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
index 08ef003479c..3d4c6ef2e03 100755
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
index e653d5a6e50..d127c4fbf93 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
index e653d5a6e50..d127c4fbf93 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
index 2ade949dc20..ff0b045fc13 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
index f0dded02000..5d853949a62 100755
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
index 35085abd060..b687e76d2ab 100755
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
index 12316573def..e012677179c 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
index 2ade949dc20..ff0b045fc13 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
index d0e5f56eefb..b78fa6e5b70 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
@@ -150,7 +150,7 @@ foreach $file (@files) {
 
     print STDERR "Starting Naming Service\n";
 
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
     $NS->Spawn ();
 
     if ($tg_naming->WaitForFileTimed ($ior_nsbase,
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
index 22ae5acba17..38644a7edb3 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
@@ -140,7 +140,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
index a6643af5534..e7b151a08fa 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
index a6643af5534..e7b151a08fa 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
index 923fabbf6c3..3d63b55fd2b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
index 9532b70d255..7c6f697d799 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
index ce55d58a40f..c921219f6bd 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
index bfb5c2088ba..98dd121792e 100755
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
index bfb5c2088ba..98dd121792e 100755
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
index abb89e4cb7e..ced13d4d3d4 100755
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
index f0dded02000..5d853949a62 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
index 623277a9ad3..5534806830b 100755
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
index d01706887b8..9f8e2c0baca 100755
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
index b369b49acc4..09750fe3a55 100755
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
index f9caf24ff9c..6cf5b6ec20c 100755
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
index 992c11148b4..2d1ea716411 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
@@ -150,7 +150,7 @@ foreach $file (@files) {
 
     print STDERR "Starting Naming Service\n";
 
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
     $NS->Spawn ();
 
     if ($tg_naming->WaitForFileTimed ($ior_nsbase,
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
index e653d5a6e50..d127c4fbf93 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
index 76cada14404..928912b3c55 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
index 9dddcf9eb14..820770a669c 100755
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
index 2970d075991..f9fec7b7cb0 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
index 17e74020995..4d44c0a1415 100755
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
index c5e47be40b0..c2442a3bdea 100755
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
@@ -139,7 +139,7 @@ init_ior_files ();
 
 # Invoke naming service
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
 $ns_status = $NS->Spawn ();