Thu Aug 12 19:35:41 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl:
        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h:
        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp:

          Removed the superfluous 'instance_' prefix on most operations.

        * DAnCE/LocalityManager/Interceptors/Best_Effort.h:
        * DAnCE/LocalityManager/Interceptors/Best_Effort.cpp:
        * DAnCE/LocalityManager/Interceptors/Standard_Error.h:
        * DAnCE/LocalityManager/Interceptors/Standard_Error.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Configured.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Connect.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Install.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Remove.cpp:
        * DAnCE/LocalityManager/Scheduler/Events/Start.cpp:
        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h:
        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp:
        * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:

          Updated to reflect the above change.

18 files changed, 177 insertions, 152 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e1aeb1195fc..9a85d9291fc 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,28 @@
+Thu Aug 12 19:35:41 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl:
+        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h:
+        * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp:
+
+          Removed the superfluous 'instance_' prefix on most operations.
+
+        * DAnCE/LocalityManager/Interceptors/Best_Effort.h:
+        * DAnCE/LocalityManager/Interceptors/Best_Effort.cpp:
+        * DAnCE/LocalityManager/Interceptors/Standard_Error.h:
+        * DAnCE/LocalityManager/Interceptors/Standard_Error.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Configured.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Connect.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Install.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Remove.cpp:
+        * DAnCE/LocalityManager/Scheduler/Events/Start.cpp:
+        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h:
+        * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp:
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+
+          Updated to reflect the above change.
+
 Thu Aug 12 19:19:00 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/Config_Handlers/DD_Handler.h:
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl
index eb84a88b64c..87401156e03 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl
+++ b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl
@@ -21,14 +21,14 @@ module DAnCE
     void preprocess_plan (inout ::Deployment::DeploymentPlan plan)
       raises (::Deployment::PlanError);
 
-    void instance_pre_install (inout ::Deployment::DeploymentPlan plan,
+    void pre_install (inout ::Deployment::DeploymentPlan plan,
                                in unsigned long instanceRef)
       raises (::Deployment::PlanError,
               ::Deployment::InvalidProperty,
               ::Deployment::InvalidNodeExecParameter,
               ::Deployment::InvalidComponentExecParameter);
 
-    void instance_post_install (in ::Deployment::DeploymentPlan plan,
+    void post_install (in ::Deployment::DeploymentPlan plan,
                                 in unsigned long instance_index,
                                 in any instance_reference,
                                 in any exception_thrown)
@@ -43,31 +43,31 @@ module DAnCE
                                   in any exception_thrown)
       raises (::Deployment::InvalidConnection);
     
-    void instance_pre_connect (inout ::Deployment::DeploymentPlan plan,
+    void pre_connect (inout ::Deployment::DeploymentPlan plan,
                                in unsigned long connection_index,
                                inout any provided_reference)
       raises (::Deployment::InvalidConnection);
 
-    void instance_post_connect (in Deployment::DeploymentPlan plan,
+    void post_connect (in Deployment::DeploymentPlan plan,
                                 in unsigned long connectionRef,
                                 in any exceptionThrown)
       raises (::Deployment::InvalidConnection);
     
-    void instance_post_configured (in ::Deployment::DeploymentPlan plan,
+    void post_configured (in ::Deployment::DeploymentPlan plan,
                                    in unsigned long instanceRef,
                                    in any exception_thrown)
       raises (::Deployment::StartError);
 
-    void instance_post_activate (in ::Deployment::DeploymentPlan plan,
+    void post_activate (in ::Deployment::DeploymentPlan plan,
                                  in unsigned long instanceRef,
                                  in any exception_thrown)
       raises (::Deployment::StartError);
 
-    void instance_post_passivate (in ::Deployment::DeploymentPlan plan,
+    void post_passivate (in ::Deployment::DeploymentPlan plan,
                                   in unsigned long instanceRef,
                                   in any exception_thrown)
       raises (::Deployment::StopError);
-    void instance_post_remove (in ::Deployment::DeploymentPlan plan,
+    void post_remove (in ::Deployment::DeploymentPlan plan,
                                in unsigned long instanceRef,
                                in any exception_thrown)
       raises (::Deployment::StopError);
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp
index ffdfa2cee23..91dd5c376fa 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp
+++ b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp
@@ -28,14 +28,14 @@ namespace DAnCE
   }
 
   void
-  DeploymentInterceptor_Base::instance_pre_install (::Deployment::DeploymentPlan &,
+  DeploymentInterceptor_Base::pre_install (::Deployment::DeploymentPlan &,
                                                     ::CORBA::ULong)
   {
     // Add your implementation here
   }
 
   void
-  DeploymentInterceptor_Base::instance_post_install (const ::Deployment::DeploymentPlan &,
+  DeploymentInterceptor_Base::post_install (const ::Deployment::DeploymentPlan &,
                                                      ::CORBA::ULong,
                                                      const ::CORBA::Any & ,
                                                      const ::CORBA::Any & )
@@ -53,7 +53,7 @@ namespace DAnCE
   }
 
   void
-  DeploymentInterceptor_Base::instance_pre_connect (::Deployment::DeploymentPlan & ,
+  DeploymentInterceptor_Base::pre_connect (::Deployment::DeploymentPlan & ,
                                                     ::CORBA::ULong ,
                                                     ::CORBA::Any & )
   {
@@ -61,35 +61,35 @@ namespace DAnCE
   }
 
   void
-  DeploymentInterceptor_Base::instance_post_connect (const ::Deployment::DeploymentPlan & ,
+  DeploymentInterceptor_Base::post_connect (const ::Deployment::DeploymentPlan & ,
                                                      ::CORBA::ULong ,
                                                      const ::CORBA::Any & )
   {
     // Add your implementation here
   }
 
-  void DeploymentInterceptor_Base::instance_post_configured (const ::Deployment::DeploymentPlan & ,
+  void DeploymentInterceptor_Base::post_configured (const ::Deployment::DeploymentPlan & ,
                                                                 ::CORBA::ULong ,
                                                                 const ::CORBA::Any &)
   {
     // Add your implementation here
   }
 
-  void DeploymentInterceptor_Base::instance_post_activate (const ::Deployment::DeploymentPlan & ,
+  void DeploymentInterceptor_Base::post_activate (const ::Deployment::DeploymentPlan & ,
                                                               ::CORBA::ULong ,
                                                               const ::CORBA::Any & )
   {
     // Add your implementation here
   }
 
-  void DeploymentInterceptor_Base::instance_post_passivate (const ::Deployment::DeploymentPlan & ,
+  void DeploymentInterceptor_Base::post_passivate (const ::Deployment::DeploymentPlan & ,
                                                                ::CORBA::ULong ,
                                                                const ::CORBA::Any &)
   {
     // Add your implementation here
   }
 
-  void DeploymentInterceptor_Base::instance_post_remove (const ::Deployment::DeploymentPlan & ,
+  void DeploymentInterceptor_Base::post_remove (const ::Deployment::DeploymentPlan & ,
                                                             ::CORBA::ULong ,
                                                             const ::CORBA::Any & )
   {
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h
index b9d978c1a03..84ab93b7811 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h
+++ b/CIAO/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h
@@ -45,13 +45,13 @@ namespace DAnCE
       void preprocess_plan (::Deployment::DeploymentPlan & plan);
   
     virtual
-      void instance_pre_install (::Deployment::DeploymentPlan & plan,
+      void pre_install (::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef);
   
     virtual
-      void instance_post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong instance_index,
-                                  const ::CORBA::Any & instance_reference,
+      void post_install (const ::Deployment::DeploymentPlan & plan,
+                                  ::CORBA::ULong index,
+                                  const ::CORBA::Any & reference,
                                   const ::CORBA::Any & exception_thrown);
 
     virtual
@@ -61,32 +61,32 @@ namespace DAnCE
                                     const ::CORBA::Any & exception_thrown);
     
     virtual
-      void instance_pre_connect (::Deployment::DeploymentPlan & plan,
+      void pre_connect (::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong connection_index,
                                  ::CORBA::Any & provided_reference);
   
     virtual
-      void instance_post_connect (const ::Deployment::DeploymentPlan & plan,
+      void post_connect (const ::Deployment::DeploymentPlan & plan,
                                   ::CORBA::ULong connectionRef,
                                   const ::CORBA::Any & exceptionThrown);
 
     virtual
-      void instance_post_configured (const ::Deployment::DeploymentPlan & plan,
+      void post_configured (const ::Deployment::DeploymentPlan & plan,
                                      ::CORBA::ULong instanceRef,
                                      const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_activate (const ::Deployment::DeploymentPlan & plan,
+      void post_activate (const ::Deployment::DeploymentPlan & plan,
                                    ::CORBA::ULong instanceRef,
                                    const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
+      void post_passivate (const ::Deployment::DeploymentPlan & plan,
                                     ::CORBA::ULong instanceRef,
                                     const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_remove (const ::Deployment::DeploymentPlan & plan,
+      void post_remove (const ::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef,
                                  const ::CORBA::Any & exception_thrown);
   };
diff --git a/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp b/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
index 42eda96226e..50c2051a3fc 100644
--- a/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
+++ b/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
@@ -25,8 +25,8 @@ namespace DAnCE
   }
 
   void
-  Best_Effort::instance_post_install (const ::Deployment::DeploymentPlan &plan,
-                                      ::CORBA::ULong instance_index,
+  Best_Effort::post_install (const ::Deployment::DeploymentPlan &plan,
+                                      ::CORBA::ULong index,
                                       const ::CORBA::Any &,
                                       const ::CORBA::Any &exception)
   {
@@ -36,16 +36,16 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while installing instance ")
                          ACE_TEXT ("<%C>:<%C>\n"),
-                         plan.instance[instance_index].name.in (),
+                         plan.instance[index].name.in (),
                          result.c_str ()));
       }
   }
 
   void
-  Best_Effort::instance_post_connect (const ::Deployment::DeploymentPlan &plan,
+  Best_Effort::post_connect (const ::Deployment::DeploymentPlan &plan,
                                          ::CORBA::ULong connection,
                                          const ::CORBA::Any &exception)
   {
@@ -55,7 +55,7 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while establishing connection ")
                          ACE_TEXT ("<%C>:<%C>\n"),
                          plan.connection[connection].name.in (),
@@ -64,8 +64,8 @@ namespace DAnCE
   }
   
   void 
-  Best_Effort::instance_post_configured (const ::Deployment::DeploymentPlan & plan,
-                                            ::CORBA::ULong instance_index,
+  Best_Effort::post_configured (const ::Deployment::DeploymentPlan & plan,
+                                            ::CORBA::ULong index,
                                             const ::CORBA::Any &exception )
   {
     if (exception.type() != ::CORBA::_tc_null)
@@ -74,18 +74,18 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while completing configuration of ")
                          ACE_TEXT ("instance <%C>:<%C>\n"),
-                         plan.instance[instance_index].name.in (),
+                         plan.instance[index].name.in (),
                          result.c_str ()));
       }
   }
   
   
   void
-  Best_Effort::instance_post_activate (const ::Deployment::DeploymentPlan & plan,
-                                       ::CORBA::ULong instance_index,
+  Best_Effort::post_activate (const ::Deployment::DeploymentPlan & plan,
+                                       ::CORBA::ULong index,
                                        const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
@@ -94,18 +94,18 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while activating instance ")
                          ACE_TEXT ("<%C>:<%C>\n"),
-                         plan.instance[instance_index].name.in (),
+                         plan.instance[index].name.in (),
                          result.c_str ()));
       }
   }
   
   
   void
-  Best_Effort::instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
-                                        ::CORBA::ULong instance_index,
+  Best_Effort::post_passivate (const ::Deployment::DeploymentPlan & plan,
+                                        ::CORBA::ULong index,
                                         const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
@@ -114,18 +114,18 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while passivating instance ")
                          ACE_TEXT ("<%C>:<%C>\n"),
-                         plan.instance[instance_index].name.in (),
+                         plan.instance[index].name.in (),
                          result.c_str ()));
       }
   }
   
   
   void
-  Best_Effort::instance_post_remove (const ::Deployment::DeploymentPlan & plan,
-                                     ::CORBA::ULong instance_index,
+  Best_Effort::post_remove (const ::Deployment::DeploymentPlan & plan,
+                                     ::CORBA::ULong index,
                                      const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
@@ -134,10 +134,10 @@ namespace DAnCE
         DAnCE::Utility::stringify_exception_from_any (exception,
                                                       result);
         DANCE_ERROR (3, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Best_Effort::instance_post_install - ")
+                         ACE_TEXT ("Best_Effort::post_install - ")
                          ACE_TEXT ("Received exception while removing instance ")
                          ACE_TEXT ("<%C>:<%C>\n"),
-                         plan.instance[instance_index].name.in (),
+                         plan.instance[index].name.in (),
                          result.c_str ()));
 
       }
diff --git a/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.h b/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.h
index 77dfd883a78..5d08dad0b3c 100644
--- a/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.h
+++ b/CIAO/DAnCE/LocalityManager/Interceptors/Best_Effort.h
@@ -32,34 +32,34 @@ namespace DAnCE
     virtual ~Best_Effort (void);
   
     virtual
-      void instance_post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong instance_index,
-                                  const ::CORBA::Any & instance_reference,
+      void post_install (const ::Deployment::DeploymentPlan & plan,
+                                  ::CORBA::ULong index,
+                                  const ::CORBA::Any & reference,
                                   const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_connect (const ::Deployment::DeploymentPlan & plan,
+      void post_connect (const ::Deployment::DeploymentPlan & plan,
                                   ::CORBA::ULong connectionRef,
                                   const ::CORBA::Any & exceptionThrown);
 
 
     virtual
-      void instance_post_configured (const ::Deployment::DeploymentPlan & plan,
+      void post_configured (const ::Deployment::DeploymentPlan & plan,
                                      ::CORBA::ULong instanceRef,
                                      const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_activate (const ::Deployment::DeploymentPlan & plan,
+      void post_activate (const ::Deployment::DeploymentPlan & plan,
                                    ::CORBA::ULong instanceRef,
                                    const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
+      void post_passivate (const ::Deployment::DeploymentPlan & plan,
                                     ::CORBA::ULong instanceRef,
                                     const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_remove (const ::Deployment::DeploymentPlan & plan,
+      void post_remove (const ::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef,
                                  const ::CORBA::Any & exception_thrown);
     virtual
diff --git a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
index 9176403ee8e..37577f85c7e 100644
--- a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
+++ b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
@@ -25,30 +25,30 @@ namespace DAnCE
   }
 
   void
-  Standard_Error::instance_post_install (const ::Deployment::DeploymentPlan &plan,
-                                         ::CORBA::ULong instance_index,
+  Standard_Error::post_install (const ::Deployment::DeploymentPlan &plan,
+                                         ::CORBA::ULong index,
                                          const ::CORBA::Any &,
                                          const ::CORBA::Any &exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_install - ")
+                         ACE_TEXT ("Standard_Error::post_install - ")
                          ACE_TEXT ("Propagating exception from instance <%C>\n"),
-                         plan.instance[instance_index].name.in ()));
+                         plan.instance[index].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
       }
   }
 
   void
-  Standard_Error::instance_post_connect (const ::Deployment::DeploymentPlan &plan,
+  Standard_Error::post_connect (const ::Deployment::DeploymentPlan &plan,
                                          ::CORBA::ULong connection,
                                          const ::CORBA::Any &exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_connect - ")
+                         ACE_TEXT ("Standard_Error::post_connect - ")
                          ACE_TEXT ("Propagating exception from connection <%C>\n"),
                          plan.connection[connection].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
@@ -56,64 +56,64 @@ namespace DAnCE
   }
   
   void 
-  Standard_Error::instance_post_configured (const ::Deployment::DeploymentPlan & plan,
-                                            ::CORBA::ULong instance_index,
+  Standard_Error::post_configured (const ::Deployment::DeploymentPlan & plan,
+                                            ::CORBA::ULong index,
                                             const ::CORBA::Any &exception )
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_configured - ")
+                         ACE_TEXT ("Standard_Error::post_configured - ")
                          ACE_TEXT ("Propagating exception from configuring instance <%C>\n"),
-                         plan.instance[instance_index].name.in ()));
+                         plan.instance[index].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
       }
   }
   
   
   void
-  Standard_Error::instance_post_activate (const ::Deployment::DeploymentPlan & plan,
-                                          ::CORBA::ULong instance_index,
+  Standard_Error::post_activate (const ::Deployment::DeploymentPlan & plan,
+                                          ::CORBA::ULong index,
                                           const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_activate - ")
+                         ACE_TEXT ("Standard_Error::post_activate - ")
                          ACE_TEXT ("Propagating exception from activation of instance <%C>\n"),
-                         plan.instance[instance_index].name.in ()));
+                         plan.instance[index].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
       }
   }
   
   
   void
-  Standard_Error::instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
-                                           ::CORBA::ULong instance_index,
+  Standard_Error::post_passivate (const ::Deployment::DeploymentPlan & plan,
+                                           ::CORBA::ULong index,
                                            const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_passivate - ")
+                         ACE_TEXT ("Standard_Error::post_passivate - ")
                          ACE_TEXT ("Propagating exception from passivation of instance <%C>\n"),
-                         plan.instance[instance_index].name.in ()));
+                         plan.instance[index].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
       }
   }
   
   
   void
-  Standard_Error::instance_post_remove (const ::Deployment::DeploymentPlan & plan,
-                                        ::CORBA::ULong instance_index,
+  Standard_Error::post_remove (const ::Deployment::DeploymentPlan & plan,
+                                        ::CORBA::ULong index,
                                         const ::CORBA::Any & exception)
   {
     if (exception.type() != ::CORBA::_tc_null)
       {
         DANCE_ERROR (2, (LM_ERROR, DLINFO
-                         ACE_TEXT ("Standard_Error::instance_post_remove - ")
+                         ACE_TEXT ("Standard_Error::post_remove - ")
                          ACE_TEXT ("Propagating exception from removal of instance <%C>\n"),
-                         plan.instance[instance_index].name.in ()));
+                         plan.instance[index].name.in ()));
         DAnCE::Utility::throw_exception_from_any (exception);
       }
   }
diff --git a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h
index 9f932c72572..384b615db31 100644
--- a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h
+++ b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h
@@ -31,34 +31,34 @@ namespace DAnCE
     virtual ~Standard_Error (void);
 
     virtual
-      void instance_post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong instance_index,
-                                  const ::CORBA::Any & instance_reference,
+      void post_install (const ::Deployment::DeploymentPlan & plan,
+                                  ::CORBA::ULong index,
+                                  const ::CORBA::Any & reference,
                                   const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_connect (const ::Deployment::DeploymentPlan & plan,
+      void post_connect (const ::Deployment::DeploymentPlan & plan,
                                   ::CORBA::ULong connectionRef,
                                   const ::CORBA::Any & exceptionThrown);
 
 
     virtual
-      void instance_post_configured (const ::Deployment::DeploymentPlan & plan,
+      void post_configured (const ::Deployment::DeploymentPlan & plan,
                                      ::CORBA::ULong instanceRef,
                                      const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_activate (const ::Deployment::DeploymentPlan & plan,
+      void post_activate (const ::Deployment::DeploymentPlan & plan,
                                    ::CORBA::ULong instanceRef,
                                    const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
+      void post_passivate (const ::Deployment::DeploymentPlan & plan,
                                     ::CORBA::ULong instanceRef,
                                     const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_remove (const ::Deployment::DeploymentPlan & plan,
+      void post_remove (const ::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef,
                                  const ::CORBA::Any & exception_thrown);
     virtual
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Configured.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Configured.cpp
index 2d9c92c65c1..02f5431ad7e 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Configured.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Configured.cpp
@@ -63,7 +63,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Instance_Configured::invoke_post_interceptor");
     
-    (*i)->instance_post_configured (this->plan_,
+    (*i)->post_configured (this->plan_,
                                     this->instanceRef_,
                                     this->instance_excep_.in ());
   }
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Connect.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Connect.cpp
index fc72ffd9394..9a392cf7b5f 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Connect.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Connect.cpp
@@ -39,7 +39,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Connect_Instance::invoke_pre_interceptor");
     
-    (*i)->instance_pre_connect (this->plan_,
+    (*i)->pre_connect (this->plan_,
                                 this->connectionRef_,
                                 this->provided_ref_);
   }
@@ -69,7 +69,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Connect_Instance::invoke_post_interceptor");
     
-    (*i)->instance_post_connect (this->plan_,
+    (*i)->post_connect (this->plan_,
                                  this->connectionRef_,
                                  this->instance_excep_.in ());
   }
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp
index 058f18aecda..2c88335c410 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp
@@ -42,7 +42,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Install_Instance::invoke_pre_interceptor");
     
-    (*i)->instance_pre_install (this->plan_,
+    (*i)->pre_install (this->plan_,
                                 this->instanceRef_);
   }
   
@@ -72,7 +72,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Install_Instance::invoke_post_interceptor");
     
-    (*i)->instance_post_install (this->plan_,
+    (*i)->post_install (this->plan_,
                                  this->instanceRef_,
                                  this->instance_.in (),
                                  this->instance_excep_.in ());
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp
index 624b5f7334e..dbc6ce3e98b 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp
@@ -66,9 +66,9 @@ namespace DAnCE
   {
     DANCE_TRACE ("Passivate_Instance::invoke_post_interceptor");
     
-    (*i)->instance_post_passivate (this->plan_,
-                                   this->instanceRef_,
-                                   this->instance_excep_.in ());
+    (*i)->post_passivate (this->plan_,
+                          this->instanceRef_,
+                          this->instance_excep_.in ());
   }
   
   
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Remove.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Remove.cpp
index 8f5f6040f89..7ee0385b36c 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Remove.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Remove.cpp
@@ -65,9 +65,9 @@ namespace DAnCE
   {
     DANCE_TRACE ("Remove_Instance::invoke_post_interceptor");
     
-    (*i)->instance_post_remove (this->plan_,
-                                this->instanceRef_,
-                                this->instance_excep_.in ());
+    (*i)->post_remove (this->plan_,
+                       this->instanceRef_,
+                       this->instance_excep_.in ());
   }
   
   
diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Start.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Start.cpp
index 692401d416a..75c9b4cc87d 100644
--- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Start.cpp
+++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Start.cpp
@@ -65,9 +65,9 @@ namespace DAnCE
   {
     DANCE_TRACE ("Start_Instance::invoke_post_interceptor");
     
-    (*i)->instance_post_activate (this->plan_,
-                                  this->instanceRef_,
-                                  this->instance_excep_.in ());
+    (*i)->post_activate (this->plan_,
+                         this->instanceRef_,
+                         this->instance_excep_.in ());
   }
   
   
diff --git a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
index 921ab2d3cdb..9a1c737ef82 100644
--- a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
@@ -35,15 +35,15 @@ namespace DAnCE
   }
   
   void
-  SHS_Interceptor::instance_post_install (const ::Deployment::DeploymentPlan &plan,
-                                          ::CORBA::ULong instance_index,
+  SHS_Interceptor::post_install (const ::Deployment::DeploymentPlan &plan,
+                                          ::CORBA::ULong index,
                                           const ::CORBA::Any &/*reference*/,
                                           const ::CORBA::Any &exception)
   {
     ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[instance_index].implementationRef;
+    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
 
-    update.id = plan.instance[instance_index].name.in ();
+    update.id = plan.instance[index].name.in ();
     update.type = 
       DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
     
@@ -68,7 +68,7 @@ namespace DAnCE
   }
 
   void
-  SHS_Interceptor::instance_post_connect (const ::Deployment::DeploymentPlan &plan,
+  SHS_Interceptor::post_connect (const ::Deployment::DeploymentPlan &plan,
                                          ::CORBA::ULong connection,
                                          const ::CORBA::Any &exception)
   {
@@ -98,14 +98,14 @@ namespace DAnCE
   }
   
   void 
-  SHS_Interceptor::instance_post_configured (const ::Deployment::DeploymentPlan & plan,
-                                            ::CORBA::ULong instance_index,
+  SHS_Interceptor::post_configured (const ::Deployment::DeploymentPlan & plan,
+                                            ::CORBA::ULong index,
                                             const ::CORBA::Any &exception )
   {
     ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[instance_index].implementationRef;
+    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
 
-    update.id = plan.instance[instance_index].name.in ();
+    update.id = plan.instance[index].name.in ();
     update.type = 
       DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
     
@@ -131,14 +131,14 @@ namespace DAnCE
   
   
   void
-  SHS_Interceptor::instance_post_activate (const ::Deployment::DeploymentPlan & plan,
-                                       ::CORBA::ULong instance_index,
+  SHS_Interceptor::post_activate (const ::Deployment::DeploymentPlan & plan,
+                                       ::CORBA::ULong index,
                                        const ::CORBA::Any & exception)
   {
     ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[instance_index].implementationRef;
+    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
 
-    update.id = plan.instance[instance_index].name.in ();
+    update.id = plan.instance[index].name.in ();
     update.type = 
       DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
     
@@ -164,14 +164,14 @@ namespace DAnCE
   
   
   void
-  SHS_Interceptor::instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
-                                        ::CORBA::ULong instance_index,
+  SHS_Interceptor::post_passivate (const ::Deployment::DeploymentPlan & plan,
+                                        ::CORBA::ULong index,
                                         const ::CORBA::Any & exception)
   {
     ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[instance_index].implementationRef;
+    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
 
-    update.id = plan.instance[instance_index].name.in ();
+    update.id = plan.instance[index].name.in ();
     update.type = 
       DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
     
@@ -197,14 +197,14 @@ namespace DAnCE
   
   
   void
-  SHS_Interceptor::instance_post_remove (const ::Deployment::DeploymentPlan & plan,
-                                     ::CORBA::ULong instance_index,
+  SHS_Interceptor::post_remove (const ::Deployment::DeploymentPlan & plan,
+                                     ::CORBA::ULong index,
                                      const ::CORBA::Any & exception)
   {
     ::DAnCE::SHS::Status_Update update;
-    CORBA::ULong mdd_idx = plan.instance[instance_index].implementationRef;
+    CORBA::ULong mdd_idx = plan.instance[index].implementationRef;
 
-    update.id = plan.instance[instance_index].name.in ();
+    update.id = plan.instance[index].name.in ();
     update.type = 
       DAnCE::Utility::get_instance_type (plan.implementation[mdd_idx].execParameter);
     
diff --git a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
index 374877906ae..a55826c84d8 100644
--- a/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
+++ b/CIAO/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h
@@ -35,34 +35,34 @@ namespace DAnCE
     virtual ~SHS_Interceptor (void);
   
     virtual
-      void instance_post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong instance_index,
-                                  const ::CORBA::Any & instance_reference,
+      void post_install (const ::Deployment::DeploymentPlan & plan,
+                                  ::CORBA::ULong index,
+                                  const ::CORBA::Any & reference,
                                   const ::CORBA::Any & exception_thrown);
 
     virtual
-      void instance_post_connect (const ::Deployment::DeploymentPlan & plan,
+      void post_connect (const ::Deployment::DeploymentPlan & plan,
                                   ::CORBA::ULong connectionRef,
                                   const ::CORBA::Any & exceptionThrown);
 
 
     virtual
-      void instance_post_configured (const ::Deployment::DeploymentPlan & plan,
+      void post_configured (const ::Deployment::DeploymentPlan & plan,
                                      ::CORBA::ULong instanceRef,
                                      const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_activate (const ::Deployment::DeploymentPlan & plan,
+      void post_activate (const ::Deployment::DeploymentPlan & plan,
                                    ::CORBA::ULong instanceRef,
                                    const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_passivate (const ::Deployment::DeploymentPlan & plan,
+      void post_passivate (const ::Deployment::DeploymentPlan & plan,
                                     ::CORBA::ULong instanceRef,
                                     const ::CORBA::Any & exception_thrown);
   
     virtual
-      void instance_post_remove (const ::Deployment::DeploymentPlan & plan,
+      void post_remove (const ::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef,
                                  const ::CORBA::Any & exception_thrown);
     virtual
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
index bff9fc93655..76e1766d12b 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
@@ -30,30 +30,30 @@ namespace CIAO
   {
   }
 
-  void CIAO_StoreReferences_i::instance_pre_install (::Deployment::DeploymentPlan &,
+  void CIAO_StoreReferences_i::pre_install (::Deployment::DeploymentPlan &,
                                                       ::CORBA::ULong)
   {
     // no-op
   }
 
-  void CIAO_StoreReferences_i::instance_post_install (const ::Deployment::DeploymentPlan &plan,
-                                                       ::CORBA::ULong instance_index,
-                                                       const ::CORBA::Any &instance_reference,
+  void CIAO_StoreReferences_i::post_install (const ::Deployment::DeploymentPlan &plan,
+                                                       ::CORBA::ULong index,
+                                                       const ::CORBA::Any &reference,
                                                        const ::CORBA::Any &)
   {
     const ::Deployment::InstanceDeploymentDescription &inst =
-      plan.instance[instance_index];
+      plan.instance[index];
     
     DANCE_DEBUG (9, (LM_TRACE, DLINFO 
-                     ACE_TEXT ("CIAO_StoreReferences_i::instance_post_install - ")
+                     ACE_TEXT ("CIAO_StoreReferences_i::post_install - ")
                      ACE_TEXT ("Interceptor post install for instance %C\n"),
-                     plan.instance[instance_index].name.in ()));
+                     plan.instance[index].name.in ()));
     
-    if (instance_reference.type() == ::CORBA::_tc_null)
+    if (reference.type() == ::CORBA::_tc_null)
       {
         DANCE_ERROR (3, (LM_WARNING, DLINFO
-                         ACE_TEXT ("CIAO_StoreReferences_i::instance_post_install - ")
-                         ACE_TEXT ("Got a nil instance_reference, unable to store reference ")
+                         ACE_TEXT ("CIAO_StoreReferences_i::post_install - ")
+                         ACE_TEXT ("Got a nil reference, unable to store reference ")
                          ACE_TEXT ("for instance <%C>\n"),
                          inst.name.in ()));
         return;
@@ -68,10 +68,10 @@ namespace CIAO
           {
             CORBA::Object_var obj;
             
-            if (!(instance_reference >>= CORBA::Any::to_object (obj)))
+            if (!(reference >>= CORBA::Any::to_object (obj)))
               {
                 DANCE_ERROR (1, (LM_WARNING, DLINFO
-                                 ACE_TEXT ("CIAO_StoreReferences_i::instance_post_install - ")
+                                 ACE_TEXT ("CIAO_StoreReferences_i::post_install - ")
                                  ACE_TEXT ("Unable to extract instance reference from Any\n")));
               }
             
@@ -79,10 +79,10 @@ namespace CIAO
             inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0);
             
             DANCE_DEBUG (9, (LM_TRACE, DLINFO 
-                             ACE_TEXT ("CIAO_StoreReferences_i::instance_post_install - ")
+                             ACE_TEXT ("CIAO_StoreReferences_i::post_install - ")
                              ACE_TEXT ("Registering name %C for instance %C\n"),
                              name,
-                             plan.instance[instance_index].name.in ()));
+                             plan.instance[index].name.in ()));
 
             Name_Utilities::bind_object (name,
                                          obj.in (),
@@ -92,7 +92,7 @@ namespace CIAO
                                  DAnCE::INSTANCE_IOR_FILE) == 0)
           {
             CORBA::Object_var obj;
-            instance_reference >>= CORBA::Any::to_object (obj);
+            reference >>= CORBA::Any::to_object (obj);
 
             const char * name = 0;
             inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0);
@@ -131,14 +131,14 @@ namespace CIAO
   }
 
   void 
-  CIAO_ReferenceLookup_i::instance_pre_connect (::Deployment::DeploymentPlan &,
+  CIAO_ReferenceLookup_i::pre_connect (::Deployment::DeploymentPlan &,
                                                  ::CORBA::ULong,
                                                  ::CORBA::Any &)
   {
     // Add your implementation here
   }
 
-  void CIAO_ReferenceLookup_i::instance_post_connect (const ::Deployment::DeploymentPlan &,
+  void CIAO_ReferenceLookup_i::post_connect (const ::Deployment::DeploymentPlan &,
                                                        ::CORBA::ULong,
                                                        const ::CORBA::Any &)
   {
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
index bd836dc6984..354cdbbf430 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h
@@ -33,13 +33,13 @@ namespace CIAO
     virtual ~CIAO_StoreReferences_i (void);
   
     virtual
-      void instance_pre_install (::Deployment::DeploymentPlan & plan,
+      void pre_install (::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong instanceRef);
   
     virtual
-      void instance_post_install (const ::Deployment::DeploymentPlan & plan,
-                                  ::CORBA::ULong instance_index,
-                                  const ::CORBA::Any & instance_reference,
+      void post_install (const ::Deployment::DeploymentPlan & plan,
+                                  ::CORBA::ULong index,
+                                  const ::CORBA::Any & reference,
                                   const ::CORBA::Any & exception_thrown);
 
     virtual
@@ -61,12 +61,12 @@ namespace CIAO
     virtual ~CIAO_ReferenceLookup_i (void);
   
     virtual
-      void instance_pre_connect (::Deployment::DeploymentPlan & plan,
+      void pre_connect (::Deployment::DeploymentPlan & plan,
                                  ::CORBA::ULong connection_index,
                                  ::CORBA::Any & provided_reference);
   
     virtual
-      void instance_post_connect (const ::Deployment::DeploymentPlan & plan,
+      void post_connect (const ::Deployment::DeploymentPlan & plan,
                                   ::CORBA::ULong connectionRef,
                                   const ::CORBA::Any & exceptionThrown);