From: Douglas Mencken <dougmencken@gmail.com>
Date: Fri, 15 Apr 2016 23:59:49 +0000 (-0400)
Subject: peaceful lexis : changes for framework
X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=c0ae261445c4122057d1bd028cb77480e43cbaeb

peaceful lexis : changes for framework

  exempli gratia “search right target frame” gets new name “look for recipient frame”

  rename framework/inc/targets.h to recipients.h
  rename framework/source/inc/loadenv/targethelper.hxx to deliveryhelper.hxx
  rename framework/source/loadenv/targethelper.cxx to deliveryhelper.cxx

eke simplify framework a bit

introduce com.sun.star.frame.FrameSearchOption
  since this com.sun.star.frame.FrameSearchFlag is obsolete but it is left for compatibility

+++ reduce visual noise from ascii fences +++

Change-Id: I402dc2370ffdb25b3073418f62712326cb7362e4
---

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index e6d0ae2..54af46e 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -100,7 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/layoutmanager/toolbarlayoutmanager \
     framework/source/layoutmanager/uielement \
     framework/source/loadenv/loadenv \
-    framework/source/loadenv/targethelper \
+    framework/source/loadenv/deliveryhelper \
     framework/source/services/ContextChangeEventMultiplexer \
     framework/source/services/autorecovery \
     framework/source/services/desktop \
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 7b19039..562f1be 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -106,7 +106,7 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
 
         //  members
 
-        OUString                                    m_aCommandURL;
+        OUString                                    m_aActionURL;
         OUString                                    m_aHelpURL;
         OUString                                    m_aText;
         css::uno::Reference< css::awt::XBitmap >    m_xBitmap;
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 838d1e1..32ad5b9 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -41,7 +41,7 @@ namespace framework{
 
 typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContainer;
 
-/*-************************************************************************************************************
+/*
     @short          implement a container to hold children of frame, task or desktop
     @descr          Every object of frame, task or desktop hold reference to his children. These container is used as helper
                     to do this. Some helper-classes like OFrames or OTasksAccess use it to. They hold a pointer to an instance
@@ -51,12 +51,10 @@ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContai
 
     @devstatus      ready to use
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 class FrameContainer
 {
 
-    // member
-
     private:
 
         /// list to hold all frames
@@ -68,7 +66,6 @@ class FrameContainer
 
     public:
 
-        /// constructor / destructor
                  FrameContainer();
         virtual ~FrameContainer();
 
@@ -76,14 +73,14 @@ class FrameContainer
         void                                      append     ( const css::uno::Reference< css::frame::XFrame >& xFrame );
         void                                      remove     ( const css::uno::Reference< css::frame::XFrame >& xFrame );
         void                                      setActive  ( const css::uno::Reference< css::frame::XFrame >& xFrame );
-        css::uno::Reference< css::frame::XFrame > getActive  (                                                         ) const;
+        css::uno::Reference< css::frame::XFrame > getActive  ( ) const;
 
         /// checks and free memory
-        bool exist      ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
-        void     clear      (                                                         );
+        bool exist ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
+        void clear ( );
 
-        /// deprecated IndexAccess!
-        sal_uInt32                                getCount  (                   ) const;
+        /// deprecated IndexAccess
+        sal_uInt32 getCount ( ) const;
         css::uno::Reference< css::frame::XFrame > operator[]( sal_uInt32 nIndex ) const;
 
         /// replacement for deprecated index access
@@ -93,9 +90,9 @@ class FrameContainer
         css::uno::Reference< css::frame::XFrame > searchOnAllChildrens   ( const OUString& sName ) const;
         css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const OUString& sName ) const;
 
-}; // class FrameContainer
+};
 
-} // namespace framework
+}
 
 #endif // INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX
 
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index e67a71c..b38efcd 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -31,7 +31,7 @@
 namespace framework{
 
 /*
-    @short          a helper to create new tasks or sub frames for "_blank" or FrameSearchFlag::CREATE
+    @short          a helper to create new tasks or sub frames for "_blank" or FrameSearchOption::Create
     @descr          There are different places to create new (task)frames and it's not easy to service this code.
                     That's the reason for this helper. It encapsulates asynchronous/synchronous creation
                     by providing a simple interface.
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 9d2f339..48df234 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -82,8 +82,8 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
                    uno resources. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        /** @short  reference to the target frame, which should be
-                    closed by this dispatch. */
+        /** @short  reference to the frame which is going to be closed
+                    by this dispatch */
         css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame;
 
         /** @short  used for asynchronous callbacks within the main thread.
@@ -119,12 +119,12 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
             @param  xFrame
                     the frame where the corresponding dispatch was started.
 
-            @param  sTarget
-                    help us to find the right target for this close operation.
+            @param  sRecipient
+                    help us to find the recipient for this close dispatch.
          */
         CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext  ,
                         const css::uno::Reference< css::frame::XFrame >&          xFrame ,
-                        const OUString&                                           sTarget);
+                        const OUString&  sRecipient );
 
         /** @short  does nothing real. */
         virtual ~CloseDispatcher() override;
@@ -243,27 +243,26 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
                                                sal_Int16                                                   nState   ,
                                          const css::uno::Any&                                              aResult  );
 
-        /** @short  try to find the right target frame where this close request
-                    must be really done.
+        /** @short  try to find the recipient frame where this close request
+                    is going to be really done.
 
             @descr  The problem behind: closing some resources depends sometimes from the
                     context where its dispatched. Sometimes the start frame of the dispatch
-                    has to be closed itself (target=_self) ... sometimes its parent frame
+                    has to be closed itself (recipient=_self) ... sometimes its parent frame
                     has to be closed - BUT(!) it means a parent frame containing a top level
                     window. _top can't be used then for dispatch - because it address TopFrames
                     not frames containg top level windows. So normally _magic (which btw does not
-                    exists at the moment .-) ) should be used. So we interpret target=<empty>
+                    exists at the moment .-) ) should be used. So we interpret recipient=<empty>
                     as _magic !
 
             @param  xFrame
                     start point for search of right dispatch frame.
 
-            @param  sTarget
-                    give us an idea how this target frame must be searched.
+            @param  sRecipient
+                    give us an idea how this recipient frame is going to be searched.
         */
-
-        static css::uno::Reference< css::frame::XFrame > static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
-                                                                                            const OUString&                           sTarget);
+        static css::uno::Reference< css::frame::XFrame > static_impl_lookForRecipientFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ,
+                                                                                            const OUString& sRecipient );
 
 }; // class CloseDispatcher
 
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index b59c878..da1af24 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -34,9 +34,9 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          a helper to merge dispatch information of different sources together.
-*//*-*************************************************************************************************************/
+*/
 class DispatchInformationProvider : public  ::cppu::WeakImplHelper< css::frame::XDispatchInformationProvider >
 {
 
@@ -65,9 +65,9 @@ class DispatchInformationProvider : public  ::cppu::WeakImplHelper< css::frame::
 
         css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > implts_getAllSubProvider();
 
-}; // class DispatchInformationProvider
+};
 
-} // namespace framework
+}
 
 #endif // INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
 
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index af0d910..17c6de7 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -62,8 +62,8 @@ enum EDispatchHelper
                             - a task can have a beamer as direct child
                             - a normal frame never can create a new one by himself
 
-    @attention      Use this class as member only! Never use it as baseclass.
-                    XInterface will be ambigous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
+    @attention      Use this class as a member only, not as a parent.
+                    XInterface will be ambigous and we hold a weakreference to OWNER - not to SUPERCLASS
 
     @base           OWeakObject
                         provides ref count and weak mechanism
@@ -88,31 +88,30 @@ class DispatchProvider: public ::cppu::WeakImplHelper< css::frame::XDispatchProv
         DispatchProvider( const css::uno::Reference< css::uno::XComponentContext >&     xContext ,
                           const css::uno::Reference< css::frame::XFrame >&              xFrame   );
 
-        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL             ,
-                                                                                                             const OUString&                                      sTargetFrameName ,
-                                                                                                                   sal_Int32                                             nSearchFlags     ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch  ( const css::util::URL&  aURL ,
+                                                                                       const OUString&  sRecipientFrameName ,
+                                                                                             sal_Int32  nSearchOptions ) throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException, std::exception ) override;
 
     /* helper */
     protected:
-        // Let him protected! So nobody can use us as base ...
         virtual ~DispatchProvider() override;
 
     private:
-        css::uno::Reference< css::frame::XDispatch > implts_getOrCreateDispatchHelper   (       EDispatchHelper                            eHelper                       ,
-                                                                                          const css::uno::Reference< css::frame::XFrame >& xOwner                        ,
-                                                                                          const OUString&                           sTarget = OUString()   ,
-                                                                                                sal_Int32                                  nSearchFlags = 0              );
-        bool                                         implts_isLoadableContent           ( const css::util::URL&                            aURL                          );
-        css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch        ( const css::uno::Reference< css::frame::XFrame >&  xDesktop                      ,
-                                                                                          const css::util::URL&                            aURL                          ,
-                                                                                          const OUString&                           sTargetFrameName              ,
-                                                                                                sal_Int32                                  nSearchFlags                  );
-        css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch          ( const css::uno::Reference< css::frame::XFrame >&  xFrame                        ,
-                                                                                          const css::util::URL&                            aURL                          ,
-                                                                                          const OUString&                           sTargetFrameName              ,
-                                                                                                sal_Int32                                  nSearchFlags                  );
-        css::uno::Reference< css::frame::XDispatch > implts_searchProtocolHandler       ( const css::util::URL&                            aURL                          );
+        css::uno::Reference< css::frame::XDispatch > implts_getOrCreateDispatchHelper   (       EDispatchHelper eHelper ,
+                                                                                          const css::uno::Reference< css::frame::XFrame >&  xOwner ,
+                                                                                          const OUString&  sRecipient = OUString() ,
+                                                                                                sal_Int32  nSearchOptions = 0 );
+        bool                                         implts_isLoadableContent           ( const css::util::URL&  aURL );
+        css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch        ( const css::uno::Reference< css::frame::XFrame >&  xDesktop ,
+                                                                                          const css::util::URL&  aURL ,
+                                                                                          const OUString&  sRecipientFrameName ,
+                                                                                                sal_Int32  nSearchOptions );
+        css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch          ( const css::uno::Reference< css::frame::XFrame >&  xFrame ,
+                                                                                          const css::util::URL&  aURL ,
+                                                                                          const OUString&  sRecipientFrameName ,
+                                                                                                sal_Int32  nSearchOptions );
+        css::uno::Reference< css::frame::XDispatch > implts_searchProtocolHandler       ( const css::util::URL&  aURL );
 
 }; // class DispatchProvider
 
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 7462303..f3ffa2b 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -41,7 +41,7 @@ namespace framework{
 /** @short      implements a helper to support interception with additional functionality.
 
     @descr      This helper implements the complete XDispatchProviderInterception interface with
-                master/slave functionality AND using of optional features like registration of URL pattern!
+                master/servant functionality AND using of optional features like registration of URL pattern!
 
     @attention  Don't use this class as direct member - use it dynamicly. Do not derive from this class.
                 We hold a weakreference to our owner not to our superclass.
@@ -136,8 +136,8 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
         css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak;
 
         /** @short this interception helper implements the top level master of an interceptor list ...
-                   but this member is the lowest possible slave! */
-        css::uno::Reference< css::frame::XDispatchProvider > m_xSlave;
+                   but this member is the lowest possible servant */
+        css::uno::Reference< css::frame::XDispatchProvider > m_xServant;
 
         /** @short contains all registered interceptor objects. */
         InterceptorList m_lInterceptionRegs;
@@ -151,11 +151,11 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
             @param xOwner
                     points to the frame, which use this instances to support it's own interception interfaces.
 
-            @param xSlave
-                    an outside creates dispatch provider, which has to be used here as lowest slave "interceptor".
+            @param xServant
+                    an outside created dispatch provider, which has to be used here as lowest servant "interceptor".
          */
         InterceptionHelper(const css::uno::Reference< css::frame::XFrame >&            xOwner,
-                           const css::uno::Reference< css::frame::XDispatchProvider >& xSlave);
+                           const css::uno::Reference< css::frame::XDispatchProvider >& xServant );
 
     protected:
 
@@ -177,37 +177,36 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
 
             @descr  We search inside our list of interception registrations, to locate
                     any interested interceptor. In case no interceptor exists or nobody is
-                    interested on this URL our lowest slave will be used.
+                    interested on this URL the lowest servant will be used.
 
             @param  aURL
                         describes the requested dispatch functionality.
 
-            @param  sTargetFrameName
-                        the name of the target frame or a special name like "_blank", "_top" ...
+            @param  sRecipientFrameName
+                        the name of the recipient frame or a special name like "_blank", "_top" ...
                         Won't be used here ... but may by one of our registered interceptor objects
-                        or our slave.
+                        or the servant.
 
-            @param  nSearchFlags
-                        optional search parameter for targeting, if sTargetFrameName isn't a special one.
+            @param  nSearchOptions
+                        optional parameter to look if sRecipientFrameName is a special one
 
-            @return A valid dispatch object, if any interceptor or at least our slave is interested on the given URL;
+            @return A valid dispatch object, if any interceptor or at least the servant is interested on the given URL;
                     or NULL otherwise.
          */
-        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL&  aURL            ,
-                                                                                    const OUString& sTargetFrameName,
-                                                                                          sal_Int32        nSearchFlags    )
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL&  aURL,
+                                                                                    const OUString& sRecipientFrameName,
+                                                                                          sal_Int32        nSearchOptions    )
             throw(css::uno::RuntimeException, std::exception) override;
 
         // XDispatchProvider
 
         /** @short implements an optimized queryDispatch() for remote.
 
-            @descr It capsulate more than one queryDispatch() requests and return a lits of dispatch objects
-                   as result. Because both lists (in and out) correspond together, it's not allowed to
-                   pack it - means suppress NULL references!
+            @descr It capsulates more than one queryDispatch() requests and return a lits of dispatch objects.
+                   Because both lists (in and out) correspond together, it wouldn't pack them - means suppress null-references
 
             @param lDescriptor
-                    a list of queryDispatch() arguments.
+                    a list of queryDispatch() arguments
 
             @return A list of dispatch objects.
          */
@@ -219,15 +218,13 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
         /** @short      register an interceptor.
 
             @descr      Somebody can register himself to intercept all or some special dispatches.
-                        It's depend from his supported interfaces. If he implement XInterceptorInfo
-                        he his called for some special URLs only - otherwise we call it for every request!
-
-            @attention  We don't check for double registrations here!
+                        It depends on its supported interfaces. If it implements XInterceptorInfo
+                        it is called for special URLs only and otherwise for every one
 
             @param      xInterceptor
                         reference to interceptor, which wish to be registered here.
 
-            @throw      A RuntimeException if the given reference is NULL!
+            @throw      A RuntimeException if the given reference is null
          */
         virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
             throw(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index f1dbabb..bc4f94b 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -71,8 +71,8 @@ class MailToDispatcher : public  ::cppu::WeakImplHelper<
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
-                                                                                                             const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                             const OUString&                                      sRecipient     ,
+                                                                                                                   sal_Int32                                             nOptions      ) throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
 
         // XNotifyingDispatch
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index c3cfddb..36297ce 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -39,17 +39,15 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
-    @short          handler to detect and play sounds ("wav" and "au" only!)
-    @descr          Register this implementation as a content handler to detect and/or play wav- and au-sounds.
-                    It doesn't depend from the target platform. But one instance of this class
-                    can play one sound at the same time only. Means every new dispatch request will stop the
-                    might still running one. So we support one operation/one URL/one listener at the same time
-                    only.
+/*
+    @short          handler to detect and play sounds (only "wav" and "au" yet)
+    @descr          Register this implementation as a content handler to detect and/or play wav and au sounds.
+                    One instance of this class can play one sound at the same time only.
+                    Means every new dispatch request will stop the still running one.
 
     @devstatus      ready
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 class Oxt_Handler  :    public  ::cppu::WeakImplHelper<
                                     css::lang::XServiceInfo,
                                     css::frame::XNotifyingDispatch, // => XDispatch
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index c4dd32b..d9993b43 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -52,7 +52,7 @@ namespace framework{
 typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
     IMPL_ListenerHashContainer;
 
-/*-************************************************************************************************************
+/*
     @short          helper for desktop only(!) to create new tasks on demand for dispatches
     @descr          Use this class as member only! Never use it as baseclass.
                     XInterface will be ambigous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@@ -65,7 +65,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
     @base           OWeakObject
 
     @devstatus      ready to use
-*//*-*************************************************************************************************************/
+*/
 class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
                                            css::lang::XServiceInfo,
                                            css::frame::XDispatchProvider,
@@ -90,8 +90,8 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
             const css::util::URL&  aURL        ,
-            const OUString& sTarget     ,
-            sal_Int32              nFlags      )
+            const OUString& sRecipient     ,
+            sal_Int32              nOptions      )
         throw( css::uno::RuntimeException, std::exception ) override;
 
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(
@@ -133,9 +133,9 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         bool                                                    m_bAlreadyDisposed;   /// Protection against multiple disposing calls.
         bool                                                    m_bActivateListener;   /// dispatcher is listener for frame activation
 
-}; //  class PopupMenuDispatcher
+};
 
-}       //  namespace framework
+}
 
 #endif // INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
 
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index ea3a66d..8613351 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -75,8 +75,8 @@ class ServiceHandler : public  ::cppu::WeakImplHelper<
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
-                                                                                                             const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                             const OUString&                                      sRecipient     ,
+                                                                                                                   sal_Int32                                             nOptions      ) throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
 
         // XNotifyingDispatch
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index fe87a90..46ef9d4 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -73,8 +73,8 @@ class SystemExec :     public  ::cppu::WeakImplHelper<
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
-                                                                                                             const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                             const OUString&                                      sRecipient     ,
+                                                                                                                   sal_Int32                                             nOptions      ) throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
 
         // XNotifyingDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 9581c77..f6ed996 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -36,9 +36,7 @@ class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::
 {
     public:
 
-        //  constructor / destructor
-
-        /*-****************************************************************************************************
+        /*
             @short      constructor to initialize this instance
             @descr      A docking area acceptor
                         But we need a instance to create more than one enumerations to the same tasklist!
@@ -49,7 +47,7 @@ class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::
             @param      "xOwner" is a reference to our owner and must be the desktop!
             @param      "pTasks" is a pointer to the taskcontainer of the desktop. We need it to create a new enumeration.
             @onerror    Do nothing and reset this object to default with an empty list.
-        *//*-*****************************************************************************************************/
+        */
 
          DockingAreaDefaultAcceptor(    const css::uno::Reference< css::frame::XFrame >& xOwner );
         virtual ~DockingAreaDefaultAcceptor() override;
@@ -60,15 +58,12 @@ class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::
         virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) override;
 
-    //  variables
-    //  (should be private everyway!)
-
     private:
 
-        css::uno::WeakReference< css::frame::XFrame >       m_xOwner;   /// weak reference to our frame object!
+        css::uno::WeakReference< css::frame::XFrame >       m_xOwner;   /// weak reference to our frame object
 };
 
-} // namespace framework
+}
 
 #endif // INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
 
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 1d541b1..ba1e943 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -37,7 +37,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          implement XEnumerationAccess interface as helper to create many oneway enumeration of components
     @descr          We share mutex and framecontainer with our owner and have full access to his child tasks.
                     (Our owner can be the Desktop only!) We create oneway enumerations on demand. These "lists"
@@ -52,7 +52,7 @@ namespace framework{
     @base           OWeakObject
 
     @devstatus      ready to use
-*//*-*************************************************************************************************************/
+*/
 
 class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnumerationAccess >
 {
@@ -63,7 +63,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
 
         //  constructor / destructor
 
-        /*-****************************************************************************************************
+        /*
             @short      constructor to initialize this instance
             @descr      A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a
                         snapshot of the components of current tasks under the desktop.
@@ -74,13 +74,13 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
 
             @param      "xOwner" is a reference to our owner and must be the desktop!
             @onerror    Do nothing and reset this object to default with an empty list.
-        *//*-*****************************************************************************************************/
+        */
 
         OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner );
 
         //  XEnumerationAccess
 
-        /*-****************************************************************************************************
+        /*
             @short      create a new enumeration of components
             @descr      You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration.
 
@@ -89,27 +89,27 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
             @seealso    class Desktop
             @return     If the desktop and some components exist => a valid reference to an enumeration<BR>
                         An NULL-reference, other way.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XElementAccess
 
-        /*-****************************************************************************************************
+        /*
             @short      get the type of elements in enumeration
             @seealso    interface XElementAccess
             @seealso    class OComponentEnumeration
             @return     The uno-type XComponent.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
 
-        /*-****************************************************************************************************
+        /*
             @short      get state of componentlist of enumeration.
             @seealso    interface XElementAccess
             @return     sal_True  ,if more than 0 elements exist.
             @return     sal_False ,otherwise.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
 
@@ -117,7 +117,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
 
     protected:
 
-        /*-****************************************************************************************************
+        /*
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         Don't use an instance of this class as normal member. Use it dynamicly with a pointer.
@@ -125,14 +125,14 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
                         Thats the reason for a protected dtor.
 
             @seealso    class Desktop
-        *//*-*****************************************************************************************************/
+        */
 
         virtual ~OComponentAccess() override;
 
 
     private:
 
-        /*-****************************************************************************************************
+        /*
             @short      recursive method (!) to collect all components of all frames from the subtree of given node
             @descr      This is necessary to create the enumeration.
 
@@ -141,12 +141,12 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
             @param      "xNode"        , root of subtree and start point of search
             @param      "seqComponents", result list of search. We can't use a return value, we search recursive
                                          and must collect all information.
-        *//*-*****************************************************************************************************/
+        */
 
         void impl_collectAllChildComponents(    const   css::uno::Reference< css::frame::XFramesSupplier >&            xNode           ,
                                                         std::vector< css::uno::Reference< css::lang::XComponent > >&   seqComponents   );
 
-        /*-****************************************************************************************************
+        /*
             @short      get the component of a frame
             @descr      The component of a frame can be the window, the controller or the model.
 
@@ -156,39 +156,17 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
             @return     A reference to the component of given frame.
 
             @onerror    A null reference is returned.
-        *//*-*****************************************************************************************************/
+        */
 
         css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
 
-    //  debug methods
-    //  (should be private everyway!)
-
-        /*-****************************************************************************************************
-            @short      debug-method to check incoming parameter of some other mehods of this class
-            @descr      The following methods are used to check parameters for other methods
-                        of this class. The return value is used directly for an ASSERT(...).
-
-            @seealso    ASSERTs in implementation!
-
-            @param      references to checking variables
-            @return     sal_False ,on invalid parameter.
-            @return     sal_True  ,otherwise
-        *//*-*****************************************************************************************************/
-
-    private:
-
-        static bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner );
-
-    //  variables
-    //  (should be private everyway!)
-
     private:
 
-        css::uno::WeakReference< css::frame::XDesktop >     m_xOwner;   /// weak reference to the desktop object!
+        css::uno::WeakReference< css::frame::XDesktop >     m_xOwner;   /// weak reference to the desktop object
 
-};      //  class OComponentAccess
+};
 
-}       //  namespace framework
+}
 
 #endif // INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
 
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e833f4d..f59898a 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -33,7 +33,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          implement a helper for a oneway enumeration of components
     @descr          You can step during this list only for one time! It's a snapshot.
                     Don't forget to release the reference. You are the owner of an instance of this implementation.
@@ -48,7 +48,7 @@ namespace framework{
 
     @devstatus      ready to use
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 
 class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::XEnumeration,css::lang::XEventListener >
 {
@@ -59,19 +59,19 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
 
         //  constructor / destructor
 
-        /*-****************************************************************************************************
+        /*
             @short      constructor to initialize this enumeration
             @descr      An enumeration is a list with oneway-access! You can get every member only for one time.
                         This method allow to initialize this oneway list with values.
             @param      "seqComponents" is a sequence of interfaces, which are components.
             @onerror    Do nothing and reset this object to default with an empty list.
-        *//*-*****************************************************************************************************/
+        */
 
          OComponentEnumeration( const std::vector< css::uno::Reference< css::lang::XComponent > >& seqComponents );
 
         //  XEventListener
 
-        /*-****************************************************************************************************
+        /*
             @short      last chance to release all references and free memory
             @descr      This method is called, if the enumeration is used completely and has no more elements.
                         Then we must destroy our list and release all references to other objects.
@@ -79,13 +79,13 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
             @seealso    interface XEventListener
 
             @param      "aEvent" describe the source of this event.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XEnumeration
 
-        /*-****************************************************************************************************
+        /*
             @short      check count of accessible elements of enumeration
             @descr      You can call this method to get information about accessible elements in future.
                         Elements you have already gotten are not accessible!
@@ -95,12 +95,12 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
                         sal_False = other way
 
             @onerror    sal_False<BR>
-                        (List is empty and there no accessible elements ...)
-        *//*-*****************************************************************************************************/
+                        (List is emtpy and there's no accessible elements ...)
+        */
 
         virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception ) override;
 
-        /*-****************************************************************************************************
+        /*
             @short      give the next element, if some exist
             @descr      If a call "hasMoreElements()" return true, you can get the next element of list.
 
@@ -108,7 +108,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
             @return     A Reference to a component, safed in an Any-structure.
 
             @onerror    If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException  ,
                                                              css::lang::WrappedTargetException      ,
@@ -118,16 +118,16 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
 
     protected:
 
-        /*-****************************************************************************************************
+        /*
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         We make it protected, because it's not supported to use this class as normal instance!
                         You must create it dynamical in memory and use a pointer.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual ~OComponentEnumeration() override;
 
-        /*-****************************************************************************************************
+        /*
             @short      reset instance to default values
 
             @descr      There are two ways to delete an instance of this class.<BR>
@@ -137,7 +137,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
 
             @seealso    method dispose()
             @seealso    destructor ~TaskEnumeration()
-        *//*-*****************************************************************************************************/
+        */
 
         void impl_resetObject();
 
@@ -147,7 +147,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
     //  debug methods
     //  (should be private everyway!)
 
-        /*-****************************************************************************************************
+        /*
             @short      debug-method to check incoming parameter of some other mehods of this class
             @descr      The following methods are used to check parameters for other methods
                         of this class. The return value is used directly for an ASSERT(...).
@@ -157,7 +157,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
             @param      references to checking variables
             @return     sal_False on invalid parameter<BR>
                         sal_True  otherway
-        *//*-*****************************************************************************************************/
+        */
 
     private:
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 9f82c47..d7ea451 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -94,14 +94,13 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
 
         /*
-            @short      return list of all applicable frames for given flags
-            @descr      Call these to get a list of all frames, which are match with given search flags.
-            @param      "nSearchFlag", flags to search right frames.
-            @return     A list of founded frames.
+            @short      return list of all applicable frames for options given
+            @param      nSearchOptions
+            @return     list of found frames
 
             @onerror    An empty list is returned.
         */
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchOptions ) throw( css::uno::RuntimeException, std::exception ) override;
 
         //  XIndexAccess
 
@@ -159,12 +158,6 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
 
     protected:
 
-        /*
-            @short      standard destructor
-            @descr      This method destruct an instance of this class and clear some member.
-                        This method is protected, because it's not allowed to use this class as a member!
-                        You MUST use a dynamical instance (pointer). That's the reason for a protected dtor.
-        */
         virtual ~OFrames() override;
 
         /*
@@ -174,7 +167,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
                         2) dispose from parent or factory ore ...<BR>
                         This method do the same for both ways! It free used memory and release references ...
 
-            @seealso    method dispose() (if it exist!)
+            @seealso    method dispose() if it exists
             @seealso    destructor ~TaskEnumeration()
         */
         void impl_resetObject();
@@ -194,19 +187,18 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         void impl_appendSequence(           css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >&    seqDestination  ,
                                      const  css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >&    seqSource       );
 
-    //  debug methods
-    //  (should be private everyway!)
+    //  private debug methods
 
         /*
-            @short      debug-method to check incoming parameter of some other mehods of this class
+            @short      debug method to check incoming parameter of some other mehods of this class
             @descr      The following methods are used to check parameters for other methods
-                        of this class. The return value is used directly for an ASSERT(...).
+                        of this class. The return value is used directly for an ASSERT(...)
 
-            @seealso    ASSERTs in implementation!
+            @seealso    ASSERTs in implementation
 
-            @param      references to checking variables
-            @return     sal_False ,on invalid parameter
-            @return     sal_True  ,otherwise
+            @param      references to variables to check
+            @return     sal_False on invalid parameter
+            @return     sal_True otherwise
         */
 
     private:
@@ -216,13 +208,12 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         static bool impldbg_checkParameter_remove       (   const   css::uno::Reference< css::frame::XFrame >&              xFrame          );
         static bool impldbg_checkParameter_queryFrames  (           sal_Int32                                               nSearchFlags    );
 
-    //  variables
-    //  (should be private everyway!)
+    //  private variables
 
     private:
-        css::uno::WeakReference< css::frame::XFrame >               m_xOwner;   /// reference to owner of this instance (Hold no hard reference!)
-        FrameContainer*                                             m_pFrameContainer;   /// with owner shared list to hold all direct children of an XFramesSupplier
-        bool                                                        m_bRecursiveSearchProtection;   /// flag to protect against recursive searches of frames at parents
+        css::uno::WeakReference< css::frame::XFrame > m_xOwner;   // reference to owner of this instance (Hold no hard reference)
+        FrameContainer* m_pFrameContainer;   // with owner shared list to hold all direct children of an XFramesSupplier
+        bool m_bRecursiveSearchLock;   // used to tune recursive searches of frames at parents
 
 };
 
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 4e84cb5..15ea51d 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -36,7 +36,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          listener for closing document frames to make her window state persistent
     @descr          It's a feature of our office. If a document window was created by ourself (and not from
                     any external process e.g. the office bean) we save and restore the window state of it
@@ -51,7 +51,7 @@ namespace framework{
 
     @devstatus      ready
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 class PersistentWindowState :   public  ::cppu::WeakImplHelper<
                                            css::lang::XInitialization,
                                            css::frame::XFrameActionListener > // => XEventListener
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index fdc2659..1e69407 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -35,9 +35,9 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          listen for modify events on model and tag frame container window so it can react accordingly
-    @descr          Used e.g. by our MAC port where such state is shown separately on some controls of the
+    @descr          Used e.g. by our mac os x port where such state is shown separately on some controls of the
                     title bar.
 
     @base           OWeakObject
@@ -45,7 +45,7 @@ namespace framework{
 
     @devstatus      draft
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 class TagWindowAsModified :   public  ::cppu::WeakImplHelper<
                                           css::lang::XInitialization,
                                           css::frame::XFrameActionListener, // => XEventListener
@@ -69,9 +69,8 @@ class TagWindowAsModified :   public  ::cppu::WeakImplHelper<
 
     public:
 
-        // ctor/dtor
                  TagWindowAsModified();
-        virtual ~TagWindowAsModified(                                                                   ) override;
+        virtual ~TagWindowAsModified() override;
 
         // XInterface, XTypeProvider
 
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 6fc4cb4..2c796b1 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -36,12 +36,12 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          helps our frame on setting title/icon on the titlebar (including updates)
 
     @devstatus      draft
     @threadsafe     yes
-*//*-*************************************************************************************************************/
+*/
 class TitleBarUpdate : public  ::cppu::WeakImplHelper<
                                    css::lang::XInitialization
                                  , css::frame::XTitleChangeListener // => XEventListener
diff --git a/framework/inc/recipients.h b/framework/inc/recipients.h
new file mode 100644
index 0000000..4358237
--- /dev/null
+++ b/framework/inc/recipients.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+#define INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+
+namespace framework {
+
+//  Values for special frame search ... sName of findFrame() or queryDispatch() or loadComponentFromURL()
+
+#define SPECIAL_SELF            "_self"                             // The frame himself is searched
+#define SPECIAL_PARENT          "_parent"                           // The direct parent frame is searched
+#define SPECIAL_TOP             "_top"                              // Search at parents for the first task (if any exist) or frame without a parent
+#define SPECIAL_BLANK           "_blank"                            // Create a new one
+#define SPECIAL_DEFAULT         "_default"                          // Create a new one or recycle an existing one
+#define SPECIAL_BEAMER          "_beamer"                           // special frame in hierarchy
+#define SPECIAL_HELPTASK        "OFFICE_HELP_TASK"                  // special name for help task
+
+}       //  namespace framework
+
+#endif // INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 8e90ba6..d9dafb5 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -66,7 +66,7 @@ enum ELoadState
     E_INTERACTION
 };
 
-/*-************************************************************************************************************
+/*
     @short      implement the topframe of frame tree
     @descr      This is the root of the frame tree. The desktop has no window, is not visible but he is the logical
                 "masternode" to build the hierarchy.
@@ -90,7 +90,7 @@ enum ELoadState
 
     @devstatus  ready to use
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 typedef cppu::WeakComponentImplHelper<
            css::lang::XServiceInfo              ,
            css::frame::XDesktop2                ,
@@ -219,8 +219,8 @@ class Desktop : private cppu::BaseMutex,
 
         //  XComponentLoader
         virtual css::uno::Reference< css::lang::XComponent >                        SAL_CALL loadComponentFromURL       ( const OUString&                                         sURL             ,
-                                                                                                                          const OUString&                                         sTargetFrameName ,
-                                                                                                                                sal_Int32                                                nSearchFlags     ,
+                                                                                                                          const OUString&                                         sRecipientFrameName ,
+                                                                                                                                sal_Int32                                                nSearchOptions     ,
                                                                                                                           const css::uno::Sequence< css::beans::PropertyValue >&         lArguments       ) throw( css::io::IOException                ,
                                                                                                                                                                                                                    css::lang::IllegalArgumentException ,
                                                                                                                                                                                                                    css::uno::RuntimeException, std::exception          ) override;
@@ -231,8 +231,8 @@ class Desktop : private cppu::BaseMutex,
 
         //  XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch >                        SAL_CALL queryDispatch              ( const css::util::URL&                                          aURL             ,
-                                                                                                                          const OUString&                                         sTargetFrameName ,
-                                                                                                                                sal_Int32                                                nSearchFlags     ) throw( css::uno::RuntimeException, std::exception          ) override;
+                                                                                                                          const OUString&                                         sRecipientFrameName ,
+                                                                                                                                sal_Int32                                                nSearchOptions     ) throw( css::uno::RuntimeException, std::exception          ) override;
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >  SAL_CALL queryDispatches            ( const css::uno::Sequence< css::frame::DispatchDescriptor >&    lQueries         ) throw( css::uno::RuntimeException, std::exception          ) override;
 
         // XDispatchProviderInterception
@@ -246,8 +246,8 @@ class Desktop : private cppu::BaseMutex,
 
         //   XFrame
         //  Attention: findFrame() is implemented only! Other methods make no sense for our desktop!
-        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL findFrame                  ( const OUString&                                         sTargetFrameName ,
-                                                                                                                                sal_Int32                                                nSearchFlags     ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL findFrame                  ( const OUString&                                         sRecipientFrameName ,
+                                                                                                                                sal_Int32                                                nSearchOptions     ) throw( css::uno::RuntimeException, std::exception          ) override;
         virtual void                                                                SAL_CALL initialize                 ( const css::uno::Reference< css::awt::XWindow >&                xWindow          ) throw( css::uno::RuntimeException, std::exception          ) override;
         virtual css::uno::Reference< css::awt::XWindow >                            SAL_CALL getContainerWindow         (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
         virtual void                                                                SAL_CALL setCreator                 ( const css::uno::Reference< css::frame::XFramesSupplier >&      xCreator         ) throw( css::uno::RuntimeException, std::exception          ) override;
@@ -408,7 +408,7 @@ class Desktop : private cppu::BaseMutex,
         css::uno::Reference< css::frame::XFrames >                      m_xFramesHelper;          /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
         css::uno::Reference< css::frame::XDispatchProvider >            m_xDispatchHelper;        /// helper to dispatch something for new tasks, created by "_blank"!
         ELoadState                                                      m_eLoadState;             /// hold information about state of asynchron loading of component for loadComponentFromURL()!
-        css::uno::Reference< css::frame::XFrame >                       m_xLastFrame;             /// last target of "loadComponentFromURL()"!
+        css::uno::Reference< css::frame::XFrame >                       m_xLastFrame;             /// last frame of loadComponentFromURL()
         css::uno::Any                                                   m_aInteractionRequest;
         bool                                                            m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
         std::unique_ptr<SvtCommandOptions>                              m_xCommandOptions;        /// ref counted class to support disabling commands defined by configuration file
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 7c5af80..95f02a5 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -33,7 +33,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @implements     XInterface
                     XTypeProvider
                     XServiceInfo
@@ -41,29 +41,27 @@ namespace framework{
     @base           OWeakObject
 
     @devstatus      deprecated
-*//*-*************************************************************************************************************/
+*/
 
 class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XStringMapping, css::lang::XServiceInfo>
 {
 
-    //  public methods
-
     public:
 
         //  constructor / destructor
 
-        /*-****************************************************************************************************
+        /*
             @short      standard ctor
             @descr      These initialize a new instance of this class with all needed information for work.
             @param      "xFactory", reference to factory which has created our owner(!). We can use these to create new uno-services.
-        *//*-*****************************************************************************************************/
+        */
 
          MediaTypeDetectionHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
 
-        /*-****************************************************************************************************
+        /*
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual ~MediaTypeDetectionHelper() override;
 
@@ -73,9 +71,6 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XS
 
         //  XStringMapping
 
-        /*-****************************************************************************************************
-        *//*-*****************************************************************************************************/
-
         virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter)
             throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
deleted file mode 100644
index a15db1e..0000000
--- a/framework/inc/targets.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_TARGETS_H
-#define INCLUDED_FRAMEWORK_INC_TARGETS_H
-
-namespace framework{
-
-//  Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
-
-#define SPECIALTARGET_SELF            "_self"                             // The frame himself is searched.
-#define SPECIALTARGET_PARENT          "_parent"                           // The direct parent frame is searched.
-#define SPECIALTARGET_TOP             "_top"                              // Search at our parents for the first task (if any exist) or a frame without a parent.
-#define SPECIALTARGET_BLANK           "_blank"                            // Create a new task.
-#define SPECIALTARGET_DEFAULT         "_default"                          // Create a new task or recycle an existing one
-#define SPECIALTARGET_BEAMER          "_beamer"                           // special frame in hierarchy
-#define SPECIALTARGET_HELPTASK        "OFFICE_HELP_TASK"                  // special name for our help task
-
-}       //  namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_TARGETS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 0c04660..7ff4489 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -26,16 +26,14 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          implement a gate to block multiple threads at same time or unblock all
     @descr          A gate can be used as a negative-condition! You can open a "door" - wait() will not block ...
                     or you can close it - wait() blocks till open() is called again.
                     Then all currently waiting threads are running immediately - but new ones are blocked!
 
     @attention      To prevent us against wrong using, the default ctor, copy ctor and the =operator are marked private!
-
-    @devstatus      ready to use
-*//*-*************************************************************************************************************/
+*/
 class Gate
 {
 
@@ -43,43 +41,45 @@ class Gate
 
     public:
 
-        /*-****************************************************************************************************
+        /*
             @short      ctor
             @descr      These initialize the object right as an open gate.
-        *//*-*****************************************************************************************************/
+        */
         inline Gate()
             :   m_bClosed   ( false )
         {
             open();
         }
 
-        /*-****************************************************************************************************
+        /*
             @short      dtor
             @descr      Is user forget it - we open the gate ...
                         blocked threads can running ... but I don't know
                         if it's right - we are destroyed yet!?
-        *//*-*****************************************************************************************************/
+        */
         inline ~Gate()
         {
             open();
         }
-        /*-****************************************************************************************************
+
+        /*
             @short      copy-ctor
             @descr      Forbid copy construction
-        *//*-*****************************************************************************************************/
+        */
         Gate(const Gate&) = delete;
-        /*-****************************************************************************************************
+
+        /*
             @short      copy-assignment
             @descr      Forbid copy assiging
-        *//*-*****************************************************************************************************/
+        */
         Gate& operator=(const Gate&) = delete;
 
-        /*-****************************************************************************************************
+        /*
             @short      open the gate
             @descr      A wait() call will not block then.
 
             @seealso    method close()
-        *//*-*****************************************************************************************************/
+        */
         void open()
         {
             // We must safe access to our internal member!
@@ -91,12 +91,12 @@ class Gate
             m_bClosed = !m_aPassage.check();
         }
 
-        /*-****************************************************************************************************
+        /*
             @short      close the gate
             @descr      A wait() call will block then.
 
             @seealso    method open()
-        *//*-*****************************************************************************************************/
+        */
         void close()
         {
             // We must safe access to our internal member!
@@ -108,7 +108,7 @@ class Gate
             m_bClosed = !m_aPassage.check();
         }
 
-        /*-****************************************************************************************************
+        /*
             @short      must be called to pass the gate
             @descr      If gate "open"   => wait() will not block.
                         If gate "closed" => wait() will block till somewhere open it again.
@@ -116,7 +116,7 @@ class Gate
             @seealso    method wait()
             @seealso    method open()
 
-        *//*-*****************************************************************************************************/
+        */
         void wait()
         {
             // We must safe access to our internal member!
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index ada6202..426107f 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -24,19 +24,17 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          make it possible to instanciate a transacion manager as first member!
     @descr          If you use a transaction manager as a member of your class and wish to use it earlier then other ones
                     you should have a look on this implementation. You must use it as the first base class
                     of your implementation - because base classes are initialized by his order and before your
                     member! Thats why ist a good place to declare this member.
     @devstatus      ready to use
-*//*-*************************************************************************************************************/
+*/
 struct TransactionBase
 {
 
-    //  public member
-
     public:
 
         mutable TransactionManager    m_aTransactionManager;   /// "your" public manager-member!
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index a4a6e9d..c46bfc8 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -31,7 +31,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @descr          Describe different states of a feature of following implementation.
                     During lifetime of an object different working states occur:
                         initialization - working - closing - closed
@@ -40,7 +40,7 @@ namespace framework{
                     call an interface method (initialize phase means startup time from creating object till
                     calling specified first method e.g. XInitialization::initialze()!) then you should refuse
                     this call. The same for closing/disposing the object!
-*//*-*************************************************************************************************************/
+*/
 enum EWorkingMode
 {
     E_INIT       ,   // We stand in a init method   -> some calls are accepted - some one are rejected
@@ -49,7 +49,7 @@ enum EWorkingMode
     E_CLOSE          // Object is dead!             -> all calls are rejected!
 };
 
-/*-************************************************************************************************************
+/*
     @descr          A transaction object should support throwing exceptions if user used it at wrong working mode.
                     e.g. We can throw a DisposedException if user try to work and our mode is E_CLOSE!
                     But sometimes he doesn't need this feature - will handle it by himself.
@@ -78,14 +78,14 @@ enum EWorkingMode
                                                 Normally (if E_HARDEXCEPTIONS was used!) creation of guard
                                                 will throw an exception ... but using of E_SOFTEXCEPTIONS suppress it
                                                 and member "A" can be set.
-*//*-*************************************************************************************************************/
+*/
 enum EExceptionMode
 {
     E_HARDEXCEPTIONS,
     E_SOFTEXCEPTIONS
 };
 
-/*-************************************************************************************************************
+/*
     @short          implement a transaction manager to support non breakable interface methods
     @descr          Use it to support non breakable interface methods without using any thread
                     synchronization like e.g. mutex, rw-lock!
@@ -94,7 +94,7 @@ enum EExceptionMode
                     and react for it. You can enable automatically throwing of exceptions too.
 
     @devstatus      draft
-*//*-*************************************************************************************************************/
+*/
 class FWI_DLLPUBLIC TransactionManager
 {
 
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 812a69d..6d47677 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -87,11 +87,11 @@ namespace framework
                        css::uno::RuntimeException,
                        std::exception) override;
             virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aActionURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
             virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
 
             // XUIConfiguration
             virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index a5ddc37..0258ad8 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -72,11 +72,11 @@ namespace framework
                        css::uno::RuntimeException,
                        std::exception) override;
             virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aActionURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
             virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
 
             // XUIConfiguration
             virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 570ffe4..b980501 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -87,7 +87,7 @@ class ButtonToolbarController : public css::frame::XStatusListener,
     private:
         bool                                                   m_bInitialized : 1,
                                                                m_bDisposed : 1;
-        OUString                                               m_aCommandURL;
+        OUString                                               m_aActionURL;
         css::uno::Reference< css::frame::XFrame >              m_xFrame;
         css::uno::Reference< css::uno::XComponentContext >     m_xContext;
         css::uno::Reference< css::util::XURLTransformer >      m_xURLTransformer;
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index e9d90d7..ed6b919 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -59,10 +59,10 @@ class ComplexToolbarController : public svt::ToolboxController
         DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
         DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, void*, void);
 
-        struct ExecuteInfo
+        struct GoInfo
         {
             css::uno::Reference< css::frame::XDispatch >     xDispatch;
-            css::util::URL                                   aTargetURL;
+            css::util::URL                                   aRecipientURL;
             css::uno::Sequence< css::beans::PropertyValue >  aArgs;
         };
 
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 96a8f9e..b7a6f8f 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -52,10 +52,10 @@ class GenericToolbarController : public svt::ToolboxController
 
         DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void );
 
-        struct ExecuteInfo
+        struct GoInfo
         {
             css::uno::Reference< css::frame::XDispatch >     xDispatch;
-            css::util::URL                                   aTargetURL;
+            css::util::URL                                   aRecipientURL;
             css::uno::Sequence< css::beans::PropertyValue >  aArgs;
         };
 
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 97e86e8..b1aaeb5 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -75,13 +75,13 @@ namespace framework
             };
 
             bool                                             m_bShowMenu;
-            OUString                                         m_aLangStatusCommandURL;
+            OUString                                         m_aLangStatusActionURL;
             css::uno::Reference< css::frame::XDispatch >     m_xLanguageDispatch;
-            OUString                                         m_aMenuCommandURL_Lang;
+            OUString                                         m_aMenuActionURL_Lang;
             css::uno::Reference< css::frame::XDispatch >     m_xMenuDispatch_Lang;
-            OUString                                         m_aMenuCommandURL_Font;
+            OUString                                         m_aMenuActionURL_Font;
             css::uno::Reference< css::frame::XDispatch >     m_xMenuDispatch_Font;
-            OUString                                         m_aMenuCommandURL_CharDlgForParagraph;
+            OUString                                         m_aMenuActionURL_CharDlgForParagraph;
             css::uno::Reference< css::frame::XDispatch >     m_xMenuDispatch_CharDlgForParagraph;
             OUString                                         m_aCurLang;
             SvtScriptType                                    m_nScriptType;
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index a709f0a..98c60b3 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -176,7 +176,7 @@ class MenuBarManager : public css::frame::XStatusListener                ,
                              xMenuItemDispatch( rDispatch ) {}
 
             sal_uInt16                                                        nItemId;
-            OUString                                                          aTargetFrame;
+            OUString                                                          aFrame;
             OUString                                                          aMenuItemURL;
             css::uno::Reference< css::frame::XStatusListener >                xSubMenuManager;
             css::uno::Reference< css::frame::XDispatch >                      xMenuItemDispatch;
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 1cced99..89cbc94 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -35,7 +35,7 @@ struct AddonMenuItem
 {
     OUString    aTitle;
     OUString    aURL;
-    OUString    aTarget;
+    OUString    aRecipient;
     OUString    aImageId;
     OUString    aContext;
     AddonMenuContainer aSubMenu;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 869650e..70bd33e 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -48,7 +48,7 @@ namespace framework
 {
     struct NewDocument
     {
-        css::util::URL                                    aTargetURL;
+        css::util::URL                                    aRecipientURL;
         css::uno::Sequence< css::beans::PropertyValue >   aArgSeq;
         css::uno::Reference< css::frame::XDispatch >      xDispatch;
     };
@@ -97,7 +97,7 @@ namespace framework
                                                                       m_bModuleIdentified : 1,
                                                                       m_bAcceleratorCfg : 1;
             OUString                                                  m_aIconTheme;
-            OUString                                                  m_aTargetFrame;
+            OUString                                                  m_aFrame;
             OUString                                                  m_aModuleIdentifier;
             OUString                                                  m_aEmptyDocURL;
             css::uno::Reference< css::uno::XComponentContext >        m_xContext;
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index fc296d5..6f4922f 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -34,7 +34,7 @@ struct AddonStatusbarItemData
 
 struct AddonStatusbarItem
 {
-    rtl::OUString     aCommandURL;
+    rtl::OUString     aActionURL;
     rtl::OUString     aLabel;
     rtl::OUString     aContext;
     StatusBarItemBits nItemBits;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 4a60aff..aab8f18 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -105,7 +105,7 @@ class ToolBarManager : public ToolbarManager_Base
             EXEC_CMD_DOCKALLTOOLBARS
         };
 
-        struct ExecuteInfo
+        struct GoInfo
         {
             OUString                                            aToolbarResName;
             ExecuteCommand                                      nCmd;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 683af86..8a1caba 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -42,17 +42,17 @@ namespace framework
 struct AddonsParams
 {
     OUString aImageId;
-    OUString aTarget;
+    OUString aRecipient;
     OUString aControlType;
     sal_uInt16 nWidth;
 };
 
 struct AddonToolbarItem
 {
-    OUString aCommandURL;
+    OUString aActionURL;
     OUString aLabel;
     OUString aImageIdentifier;
-    OUString aTarget;
+    OUString aRecipient;
     OUString aContext;
     OUString aControlType;
     sal_uInt16 nWidth;
@@ -76,10 +76,10 @@ class ToolBarMerger
                                                  AddonToolbarItemContainer& rContainer );
 
         static void       ConvertSequenceToValues( const css::uno::Sequence< css::beans::PropertyValue >& rSequence,
-                                                   OUString& rCommandURL,
+                                                   OUString& rActionURL,
                                                    OUString& rLabel,
                                                    OUString& rImageIdentifier,
-                                                   OUString& rTarget,
+                                                   OUString& rRecipient,
                                                    OUString& rContext,
                                                    OUString& rControlType,
                                                    sal_uInt16& rWidth );
@@ -128,7 +128,7 @@ class ToolBarMerger
             const css::uno::Reference< css::uno::XComponentContext > & rxContext,
             const css::uno::Reference< css::frame::XFrame > & xFrame,
             ToolBox*        pToolbar,
-            const OUString& rCommandURL,
+            const OUString& rActionURL,
             sal_uInt16      nId,
             sal_uInt16      nWidth,
             const OUString& rControlType );
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 5573303..a097046 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -73,10 +73,10 @@ namespace framework
             // XEventListener
             virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override;
 
-            struct ExecuteInfo
+            struct GoInfo
             {
-                css::uno::Reference< css::frame::XDispatch >     xDispatch;
-                css::util::URL                                                aTargetURL;
+                css::uno::Reference< css::frame::XDispatch >  xDispatch;
+                css::util::URL  aURL;
                 css::uno::Sequence< css::beans::PropertyValue >  aArgs;
             };
 
@@ -85,8 +85,8 @@ namespace framework
         private:
             void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
             css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager );
-            css::uno::Reference< css::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL );
-            void addCommand( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
+            css::uno::Reference< css::frame::XDispatch > getDispatchFromActionURL( const OUString& rActionURL );
+            void addCommand( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rActionURL, const OUString& aLabel );
             bool isContextSensitiveToolbarNonVisible() { return m_bResetActive;}
 
             css::uno::Reference< css::uno::XComponentContext >        m_xContext;
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index f0d308d..c7ddd7f 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -52,10 +52,10 @@ public:
     void          readConfigurationData();
     void          updateConfigurationData();
 
-    OUString getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const;
-    OUString getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const;
-    void          addServiceToCommandModule( const OUString& rCommandURL, const OUString& rModule, const OUString& rServiceSpecifier );
-    void          removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule );
+    OUString getServiceFromCommandModule( const OUString& rActionURL, const OUString& rModule ) const;
+    OUString getValueFromCommandModule( const OUString& rActionURL, const OUString& rModule ) const;
+    void          addServiceToCommandModule( const OUString& rActionURL, const OUString& rModule, const OUString& rServiceSpecifier );
+    void          removeServiceFromCommandModule( const OUString& rActionURL, const OUString& rModule );
 
     // container.XContainerListener
     virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index cccdb17..7f2ba95 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -126,7 +126,7 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml::
             throw(css::xml::sax::SAXException,
                   css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& sTarget,
+        virtual void SAL_CALL processingInstruction(const OUString& sRecipient,
                                                     const OUString& sData  )
             throw(css::xml::sax::SAXException,
                   css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 61778f0..5788e7d 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -44,13 +44,13 @@ struct ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
 
-    OUString  aCommandURL;                // URL command to dispatch
+    OUString  aActionURL;
     long      nIndex;                     // index of the bitmap inside the bitmaplist
 };
 
 struct ExternalImageItemDescriptor
 {
-    OUString  aCommandURL;                // URL command to dispatch
+    OUString  aActionURL;
     OUString  aURL;                       // a URL to an external bitmap
 };
 
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 8527642..2d62a78 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -96,7 +96,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& aTarget,
+        virtual void SAL_CALL processingInstruction( const OUString& aRecipient,
                                                     const OUString& aData)
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 6a1d99a..3ca344b 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -68,7 +68,7 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& aTarget,
+        virtual void SAL_CALL processingInstruction( const OUString& aRecipient,
                                                     const OUString& aData)
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
@@ -84,14 +84,14 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
         css::uno::Reference< css::xml::sax::XLocator > m_xLocator;
         css::uno::Reference< css::xml::sax::XDocumentHandler> m_xReader;
         void initPropertyCommon( css::uno::Sequence< css::beans::PropertyValue > &rProps,
-                                 const OUString &rCommandURL, const OUString &rHelpId,
+                                 const OUString &rActionURL, const OUString &rHelpId,
                                  const OUString &rLabel, sal_Int16 nItemStyleBits );
     private:
         OUString m_aType;
         OUString m_aLabel;
         OUString m_aContainer;
         OUString m_aHelpURL;
-        OUString m_aCommandURL;
+        OUString m_aActionURL;
         OUString m_aStyle;
 };
 
@@ -265,7 +265,7 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler
         void WriteMenu( const css::uno::Reference< css::container::XIndexAccess >& rSubMenuContainer ) throw
             ( css::xml::sax::SAXException, css::uno::RuntimeException );
 
-        void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle );
+        void WriteMenuItem( const OUString& aActionURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle );
         void WriteMenuSeparator();
 
         css::uno::Reference< css::container::XIndexAccess > m_xMenuBarContainer;
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index d137cf0..f6f70ac 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -66,7 +66,7 @@ class FWE_DLLPUBLIC SaxNamespaceFilter :
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& aTarget,
+        virtual void SAL_CALL processingInstruction( const OUString& aRecipient,
                                                     const OUString& aData)
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 0c1c3aa..c5cb8dc 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -91,7 +91,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& aTarget,
+        virtual void SAL_CALL processingInstruction( const OUString& aRecipient,
                                                     const OUString& aData)
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
@@ -131,7 +131,7 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler
 
     protected:
         void WriteStatusBarItem(
-            const OUString& rCommandURL,
+            const OUString& rActionURL,
             const OUString& rHelpURL,
             sal_Int16            nOffset,
             sal_Int16            nStyle,
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 16d3986..7eed860 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -91,7 +91,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
 
-        virtual void SAL_CALL processingInstruction(const OUString& aTarget,
+        virtual void SAL_CALL processingInstruction( const OUString& aRecipient,
                                                     const OUString& aData)
         throw(  css::xml::sax::SAXException,
                 css::uno::RuntimeException, std::exception ) override;
@@ -133,7 +133,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
         OUString                                                  m_aStyle;
         OUString                                                  m_aHelpURL;
         OUString                                                  m_aIsVisible;
-        OUString                                                  m_aCommandURL;
+        OUString                                                  m_aActionURL;
 };
 
 class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
@@ -149,7 +149,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
               css::uno::RuntimeException );
 
     protected:
-        void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL,
+        void WriteToolBoxItem( const OUString& aActionURL, const OUString& aLabel, const OUString& aHelpURL,
                                sal_Int16 nStyle, bool bVisible ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index d8d1c06..0c3192a 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -615,9 +615,9 @@ public class AcceleratorsConfigurationTest
 
         if (xCfgMgr != null)
         {
-            XAcceleratorConfiguration xTargetAccMgr = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, xCfgMgr.getShortCutManager());
-            XUIConfigurationPersistence xCommit1 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xTargetAccMgr);
-            XUIConfigurationPersistence xCommit2 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xCfgMgr);
+            XAcceleratorConfiguration xRecipientAccMgr = UnoRuntime.queryInterface( XAcceleratorConfiguration.class, xCfgMgr.getShortCutManager() );
+            XUIConfigurationPersistence xCommit1 = UnoRuntime.queryInterface( XUIConfigurationPersistence.class, xRecipientAccMgr );
+            XUIConfigurationPersistence xCommit2 = UnoRuntime.queryInterface( XUIConfigurationPersistence.class, xCfgMgr );
             xCommit1.store();
             xCommit2.store();
 
diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
index eb0060d..37f36da 100644
--- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
@@ -58,41 +58,44 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor
 
                 // query sub menu for index container to get access
                 com.sun.star.container.XIndexContainer xSubMenuContainer =
-                        UnoRuntime.queryInterface(com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer"));
+                        UnoRuntime.queryInterface( com.sun.star.container.XIndexContainer.class,
+                                                   xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTriggerContainer" ) );
 
                 // intialize root menu entry "Help"
-                xRootMenuEntry.setPropertyValue("Text", "Help");
-                xRootMenuEntry.setPropertyValue("CommandURL", "slot:5410");
-                xRootMenuEntry.setPropertyValue("HelpURL", "5410");
-                xRootMenuEntry.setPropertyValue("SubContainer", xSubMenuContainer);
-                xRootMenuEntry.setPropertyValue("Image", myBitmap);
+                xRootMenuEntry.setPropertyValue( "Text", "Help" ) ;
+                xRootMenuEntry.setPropertyValue( "ActionURL", "slot:5410" ) ;
+                xRootMenuEntry.setPropertyValue( "HelpURL", "5410" ) ;
+                xRootMenuEntry.setPropertyValue( "SubContainer", xSubMenuContainer ) ;
+                xRootMenuEntry.setPropertyValue( "Image", myBitmap ) ;
 
                 // create menu entries for the new sub menu
                 // intialize help/content menu entry
                 // entry "Content"
-                XPropertySet xMenuEntry = UnoRuntime.queryInterface(XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
-                xMenuEntry.setPropertyValue("Text", "Content");
-                xMenuEntry.setPropertyValue("CommandURL", "slot:5401");
-                xMenuEntry.setPropertyValue("HelpURL", "5401");
+                XPropertySet xMenuEntry = UnoRuntime.queryInterface( XPropertySet.class,
+                                                                     xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTrigger" ) );
+                xMenuEntry.setPropertyValue( "Text", "Content" ) ;
+                xMenuEntry.setPropertyValue( "ActionURL", "slot:5401" ) ;
+                xMenuEntry.setPropertyValue( "HelpURL", "5401" ) ;
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex(0, xMenuEntry);
 
-                // intialize help/help on help
+                // intialize help / help on help
                 // entry "Help on Help"
-                xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
-                xMenuEntry.setPropertyValue("Text", "Help on Help");
-                xMenuEntry.setPropertyValue("CommandURL", "slot:5400");
-                xMenuEntry.setPropertyValue("HelpURL", "5400");
+                xMenuEntry = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTrigger" ) );
+                xMenuEntry.setPropertyValue( "Text", "Help on Help" );
+                xMenuEntry.setPropertyValue( "ActionURL", "slot:5400" );
+                xMenuEntry.setPropertyValue( "HelpURL", "5400" );
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex(1, xMenuEntry);
                 // intialize help/tips
                 // entry "Tips"
-                xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
-                xMenuEntry.setPropertyValue("Text", "Tips");
-                xMenuEntry.setPropertyValue("CommandURL", "slot:5404");
-                xMenuEntry.setPropertyValue("HelpURL", "5404");
+                xMenuEntry = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class,
+                                                        xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTrigger" ) );
+                xMenuEntry.setPropertyValue( "Text", "Tips" );
+                xMenuEntry.setPropertyValue( "ActionURL", "slot:5404" );
+                xMenuEntry.setPropertyValue( "HelpURL", "5404" );
 
                 // insert menu entry to sub menu
                 xSubMenuContainer.insertByIndex(2, xMenuEntry);
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index ecbac44..76b886b 100644
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -179,10 +179,10 @@ public class Interceptor implements XDispatch,
     /** XDispatchProvider
      */
     public synchronized XDispatch queryDispatch(URL    aURL,
-                                                String sTargetFrameName,
-                                                int    nSearchFlags)
+                                                String sRecipientFrameName,
+                                                int    nSearchOptions)
     {
-        System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called");
+        System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sRecipientFrameName+"', "+nSearchOptions+") called");
 
         checkNoSolarMutexHeld();
 
@@ -195,7 +195,7 @@ public class Interceptor implements XDispatch,
         if (m_xSlave != null)
         {
             System.out.println("Interceptor.queryDispatch(): ask slave ...");
-            return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags);
+            return m_xSlave.queryDispatch(aURL, sRecipientFrameName, nSearchOptions);
         }
 
         System.out.println("Interceptor.queryDispatch(): no idea => returns this");
@@ -216,7 +216,7 @@ public class Interceptor implements XDispatch,
         {
             lResults[i] = queryDispatch(lRequests[i].FeatureURL ,
                                         lRequests[i].FrameName  ,
-                                        lRequests[i].SearchFlags);
+                                        lRequests[i].SearchOptions);
         }
 
         return lResults;
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 82f3eb3..dd01c17 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -663,7 +663,7 @@ public class Protocol extends JComponent
      * returns a generic html header for generating html log files
      *
      * It's used from the method finish() to generate a valid html formatted file.
-     * For that its necessary to open some special html targets like e.g. <html>.
+     * For that its necessary to open some special html receivers like e.g. <html>.
      *
      * @return  A string, which includes the whole header.
      *
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 4605820..ac7c309 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -115,7 +115,7 @@ public class RecoveryTest extends ComplexTestCase {
 
     public void before() throws Exception {
 
-        String msg ="\n\n\tPATH TO OFFICE BINARY MISSING!\n";
+        String msg ="\n\n\tPATH TO OFFICE BINARY IS ABSENT\n";
         msg +="\tPlease run your command with the following parameter:\n\n";
         msg +="\t-AppExecutionCommand=OFFICEBINARY CONNECTIONSTRING\n\n";
         msg +="Example Windows:\n";
@@ -126,7 +126,7 @@ public class RecoveryTest extends ComplexTestCase {
 
         assure(msg, param.get("AppExecutionCommand") != null && ! param.get("AppExecutionCommand").equals(""));
         System.out.println("HALLO" + param.get("AppExecutionCommand"));
-        msg = "\n\nONE PARAMETER IS MISSING!\n";
+        msg = "\n\nONE PARAMETER IS ABSENT\n";
         msg += "Please append to your command the following parameter:\n\n";
         msg += "\t-NoOffice=true";
         assure(msg, param.getBool("NoOffice"));
@@ -447,16 +447,16 @@ public class RecoveryTest extends ComplexTestCase {
                 }
                 String tempURL = utils.getOfficeTempDir(xMSF);
 
-                log.println("the destination for saving is: " + tempURL);
+                log.println("the recipient for saving is: " + tempURL);
                 try{
                     oUITools.setTextEditFiledText("Save to", tempURL);
                 } catch (java.lang.Exception e){
-                    failed("could not set target directory for saving documents at 'Save Documents' dialog", ContinueWithTest.YES);
+                    failed( "could not set recipient directory for saving documents at Save Documents dialog", ContinueWithTest.YES );
                 }
                 try{
                     oUITools.clickButton("OK");
                 } catch (java.lang.Exception e){
-                    failed("could not click 'OK' at 'Save Documents' dialog", ContinueWithTest.YES);
+                    failed("could not click OK at Save Documents dialog", ContinueWithTest.YES);
                 }
             }
         } catch (com.sun.star.accessibility.IllegalAccessibleComponentStateException e){
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 3f56147..4dd8ba8 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -129,7 +129,7 @@ public class CheckXComponentLoader
 
         // create frame instance
         m_xFrame = xDesktop.findFrame("testFrame_componentLoader",
-                                        FrameSearchFlag.TASKS | FrameSearchFlag.CREATE);
+                                        FrameSearchOption.Tasks | FrameSearchOption.Create);
         assertNotNull("Couldn't create test frame.", m_xFrame);
 
         // define default loader for testing
@@ -250,8 +250,8 @@ public class CheckXComponentLoader
 
     /** TODO document me and move this method to a more global helper! */
     private void impl_createTempOfficeDocument(XComponentLoader xLoader   ,
-                                               String           sSourceURL,
-                                               String           sTargetURL,
+                                               String           sFromURL,
+                                               String           sToURL,
                                                String           sFilter   ,
                                                String           sPassword ) throws Exception
     {
@@ -277,14 +277,14 @@ public class CheckXComponentLoader
 
         XComponent xDoc = null;
         // load it
-        xDoc = xLoader.loadComponentFromURL(sSourceURL, "_blank", 0, lLoadProps);
+        xDoc = xLoader.loadComponentFromURL( sFromURL, "_blank", 0, lLoadProps );
         assertNotNull("Could create office document, which should be saved as temp one.", xDoc);
 
         // save it as temp file
         XStorable xStore = UnoRuntime.queryInterface(XStorable.class, xDoc);
-        xStore.storeAsURL(sTargetURL, lSaveProps);
+        xStore.storeAsURL( sToURL, lSaveProps );
 
-        // Don't forget to close this file. Otherwise the temp file is locked!
+        // Don't forget to close this file, otherwise the temp file is locked
         XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
         xClose.close(false);
     }
@@ -424,13 +424,13 @@ public class CheckXComponentLoader
      * but opened documents.
      */
     private void loadURL(XComponentLoader xLoader, int nRequiredResult,
-                         String sURL, String sTarget, int nFlags,
+                         String sURL, String sRecipient, int nOptions,
                          PropertyValue[] lProps) {
         int nResult = RESULT_EMPTY_DOC;
         XComponent xDoc = null;
 
         try {
-            xDoc = xLoader.loadComponentFromURL(sURL, sTarget, nFlags,
+            xDoc = xLoader.loadComponentFromURL(sURL, sRecipient, nOptions,
                                                      lProps);
 
             if (xDoc != null) {
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3e27f5c..22b7d15 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -50,7 +50,7 @@
 #include <svtools/acceleratorexecute.hxx>
 
 #define PRESET_DEFAULT "default"
-#define TARGET_CURRENT "current"
+#define RECEIVER_CURRENT "current"
 
 namespace framework
 {
@@ -232,8 +232,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
     css::uno::Reference< css::io::XStream > xStreamNoLang;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
-                css::embed::ElementModes::READ);
+        xStream = m_aPresetHandler.openRecipient( RECEIVER_CURRENT, css::embed::ElementModes::READ );
         try
         {
             xStreamNoLang = m_aPresetHandler.openPreset(PRESET_DEFAULT);
@@ -274,8 +273,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
     css::uno::Reference< css::io::XStream > xStream;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
-               css::embed::ElementModes::READWRITE); // open or create!
+        xStream = m_aPresetHandler.openRecipient( RECEIVER_CURRENT, css::embed::ElementModes::READWRITE ); // open or create
     }
 
     css::uno::Reference< css::io::XOutputStream > xOut;
@@ -301,7 +299,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 {
     css::uno::Reference< css::io::XStream > xStream = StorageHolder::openSubStreamWithFallback(
                                                             xStorage,
-                                                            TARGET_CURRENT,
+                                                            RECEIVER_CURRENT,
                                                             css::embed::ElementModes::READWRITE,
                                                             false); // False => no fallback from read/write to readonly!
     css::uno::Reference< css::io::XOutputStream > xOut;
@@ -331,8 +329,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
     css::uno::Reference< css::io::XStream > xStream;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
-                css::embed::ElementModes::READWRITE); // open or create!
+        xStream = m_aPresetHandler.openRecipient( RECEIVER_CURRENT, css::embed::ElementModes::READWRITE ); // open or create
     }
 
     css::uno::Reference< css::io::XOutputStream > xOut;
@@ -371,7 +368,7 @@ throw(css::uno::RuntimeException, std::exception)
 {
     {
         SolarMutexGuard g;
-        m_aPresetHandler.copyPresetToTarget(PRESET_DEFAULT, TARGET_CURRENT);
+        m_aPresetHandler.copyPresetToRecipient( PRESET_DEFAULT, RECEIVER_CURRENT );
     }
 
     reload();
@@ -512,11 +509,11 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
     return sISOLocale;
 }
 
-/*******************************************************************************
+/*
 *
 * XCU based accelerator configuration
 *
-*******************************************************************************/
+*/
 
 XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
                                 : m_xContext      (xContext                     )
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 628cfa2..bc04b32 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -88,19 +88,19 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont
 PresetHandler::PresetHandler(const PresetHandler& rCopy)
     : m_aLanguageTag( rCopy.m_aLanguageTag)
 {
-    m_xContext              = rCopy.m_xContext;
-    m_eConfigType           = rCopy.m_eConfigType;
-    m_sResourceType         = rCopy.m_sResourceType;
-    m_sModule               = rCopy.m_sModule;
-    m_xWorkingStorageShare  = rCopy.m_xWorkingStorageShare;
+    m_xContext = rCopy.m_xContext;
+    m_eConfigType = rCopy.m_eConfigType;
+    m_sResourceType = rCopy.m_sResourceType;
+    m_sModule = rCopy.m_sModule;
+    m_xWorkingStorageShare = rCopy.m_xWorkingStorageShare;
     m_xWorkingStorageNoLang = rCopy.m_xWorkingStorageNoLang;
-    m_xWorkingStorageUser   = rCopy.m_xWorkingStorageUser;
-    m_lPresets              = rCopy.m_lPresets;
-    m_lTargets              = rCopy.m_lTargets;
-    m_lDocumentStorages     = rCopy.m_lDocumentStorages;
-    m_sRelPathShare         = rCopy.m_sRelPathShare;
-    m_sRelPathNoLang        = rCopy.m_sRelPathNoLang;
-    m_sRelPathUser          = rCopy.m_sRelPathUser;
+    m_xWorkingStorageUser = rCopy.m_xWorkingStorageUser;
+    m_lPresets = rCopy.m_lPresets;
+    m_lRecipients = rCopy.m_lRecipients;
+    m_lDocumentStorages = rCopy.m_lDocumentStorages;
+    m_sRelPathShare = rCopy.m_sRelPathShare;
+    m_sRelPathNoLang = rCopy.m_sRelPathNoLang;
+    m_sRelPathUser = rCopy.m_sRelPathUser;
 }
 
 PresetHandler::~PresetHandler()
@@ -456,14 +456,14 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         sRelPathUser  = sLocalizedUserPath;
     }
 
-    // read content of level 3 (presets, targets)
+    // read content of level 3 (presets, recipients)
           css::uno::Reference< css::container::XNameAccess > xAccess;
           css::uno::Sequence< OUString >              lNames;
     const OUString*                                   pNames;
           sal_Int32                                          c;
           sal_Int32                                          i;
           std::vector<OUString> lPresets;
-          std::vector<OUString> lTargets;
+          std::vector<OUString> lRecipients;
 
     // read preset names of share layer
     xAccess.set(xShare, css::uno::UNO_QUERY);
@@ -497,7 +497,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
             sal_Int32       nPos  = sTemp.indexOf(".xml");
             if (nPos > -1)
                 sTemp = sTemp.copy(0,nPos);
-            lTargets.push_back(sTemp);
+            lRecipients.push_back(sTemp);
         }
     }
 
@@ -507,7 +507,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         m_xWorkingStorageNoLang= xNoLang;
         m_xWorkingStorageUser  = xUser;
         m_lPresets             = lPresets;
-        m_lTargets             = lTargets;
+        m_lRecipients = lRecipients;
         m_sRelPathShare        = sRelPathShare;
         m_sRelPathNoLang       = sRelPathNoLang;
         m_sRelPathUser         = sRelPathUser;
@@ -522,11 +522,10 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     }
 }
 
-void PresetHandler::copyPresetToTarget(const OUString& sPreset,
-                                       const OUString& sTarget)
+void PresetHandler::copyPresetToRecipient( const OUString& sPreset,
+                                       const OUString& sRecipient )
 {
-    // don't check our preset list, if element exists
-    // We try to open it and forward all errors to the user!
+    // don't check preset list if element exists
 
     css::uno::Reference< css::embed::XStorage > xWorkingShare;
     css::uno::Reference< css::embed::XStorage > xWorkingNoLang;
@@ -534,35 +533,34 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
     {
         SolarMutexGuard g;
         xWorkingShare = m_xWorkingStorageShare;
-        xWorkingNoLang= m_xWorkingStorageNoLang;
-        xWorkingUser  = m_xWorkingStorageUser;
+        xWorkingNoLang = m_xWorkingStorageNoLang;
+        xWorkingUser = m_xWorkingStorageUser;
     }
 
-    // e.g. module without any config data ?!
     if (
-        (!xWorkingShare.is()) ||
-        (!xWorkingUser.is() )
+         ( !xWorkingShare.is() ) ||
+         ( !xWorkingUser.is() )
        )
     {
-       return;
+        SAL_WARN( "framework", "e.g. module without any config data ?" );
+        return;
     }
 
     OUString sPresetFile(sPreset);
     sPresetFile += ".xml";
 
-    OUString sTargetFile(sTarget);
-    sTargetFile += ".xml";
+    OUString sRecipientFile(sRecipient);
+    sRecipientFile += ".xml";
 
     // remove existing elements before you try to copy the preset to that location ...
-    // Otherwise w will get an ElementExistException inside copyElementTo()!
+    // Otherwise will get an ElementExistException inside copyElementTo()
     css::uno::Reference< css::container::XNameAccess > xCheckingUser(xWorkingUser, css::uno::UNO_QUERY_THROW);
-    if (xCheckingUser->hasByName(sTargetFile))
-        xWorkingUser->removeElement(sTargetFile);
+    if (  xCheckingUser->hasByName( sRecipientFile ) )
+        xWorkingUser->removeElement( sRecipientFile );
 
-    xWorkingShare->copyElementTo(sPresetFile, xWorkingUser, sTargetFile);
+    xWorkingShare->copyElementTo( sPresetFile, xWorkingUser, sRecipientFile );
 
-    // If our storages work in transacted mode, we have
-    // to commit all changes from bottom to top!
+    // If storages work as transacted, commit all changes from bottom to top
     commitUserChanges();
 }
 
@@ -586,8 +584,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
     return xStream;
 }
 
-css::uno::Reference< css::io::XStream > PresetHandler::openTarget(
-        const OUString& sTarget, sal_Int32 const nMode)
+css::uno::Reference< css::io::XStream > PresetHandler::openRecipient( const OUString& sRecipient, sal_Int32 const nMode )
 {
     css::uno::Reference< css::embed::XStorage > xFolder;
     {
@@ -599,7 +596,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(
     if (!xFolder.is())
        return css::uno::Reference< css::io::XStream >();
 
-    OUString const sFile(sTarget + ".xml");
+    OUString const sFile( sRecipient + ".xml" );
 
     return xFolder->openStreamElement(sFile, nMode);
 }
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index b8a16dc..3d333d5 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -19,19 +19,19 @@
 
 #include <classes/framecontainer.hxx>
 
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 
 #include <vcl/svapp.hxx>
 #include <comphelper/sequence.hxx>
 
 namespace framework{
 
-/**-***************************************************************************************************************
+/**
     @short      initialize an empty container
     @descr      The container will be empty then - special features (e.g. the async quit mechanism) are disabled.
 
     @threadsafe not necessary - it's not a singleton
- *****************************************************************************************************************/
+*/
 FrameContainer::FrameContainer()
 /*DEPRECATEME
         , m_bAsyncQuit   ( sal_False                                      ) // default must be "disabled"!
@@ -40,20 +40,20 @@ FrameContainer::FrameContainer()
 {
 }
 
-/**-***************************************************************************************************************
+/**
     @short      deinitialize may a filled container
     @descr      Special features (if the currently are running) will be disabled and we free all used other resources.
 
     @threadsafe not necessary - it's not a singleton
- *****************************************************************************************************************/
+*/
 FrameContainer::~FrameContainer()
 {
-    // Don't forget to free memory!
+    // Don't forget to free memory
     m_aContainer.clear();
     m_xActiveFrame.clear();
 }
 
-/**-***************************************************************************************************************
+/**
     @short      append a new frame to the container
     @descr      We accept the incoming frame only, if it is a valid reference and doesn't exist already.
 
@@ -62,7 +62,7 @@ FrameContainer::~FrameContainer()
                     Must be a valid reference.
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
     if (xFrame.is() && ! exist(xFrame))
@@ -72,7 +72,7 @@ void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xF
     }
 }
 
-/**-***************************************************************************************************************
+/**
     @short      remove a frame from the container
     @descr      In case we remove the last frame and our internal special feature (the async quit mechanism)
                 was enabled by the desktop instance, we start it.
@@ -82,7 +82,7 @@ void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xF
                     Must be a valid reference.
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
     SolarMutexGuard g;
@@ -98,7 +98,7 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF
     }
 }
 
-/**-***************************************************************************************************************
+/**
     @short      check if the given frame currently exist inside the container
     @param      xFrame
                     reference to the queried frame
@@ -107,17 +107,17 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF
                 <FALSE/> otherwise
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 bool FrameContainer::exist( const css::uno::Reference< css::frame::XFrame >& xFrame ) const
 {
     SolarMutexGuard g;
     return( ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ) != m_aContainer.end() );
 }
 
-/**-***************************************************************************************************************
+/**
     @short      delete all existing items of the container
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 void FrameContainer::clear()
 {
     SolarMutexGuard g;
@@ -129,7 +129,7 @@ void FrameContainer::clear()
     m_xActiveFrame.clear();
 }
 
-/**-***************************************************************************************************************
+/**
     @short      returns count of all current existing frames
     @deprecated This value can't be guaranteed for multithreading environments.
                 So it will be marked as deprecated and should be replaced by "getAllElements()".
@@ -137,14 +137,14 @@ void FrameContainer::clear()
     @return     the count of existing container items
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 sal_uInt32 FrameContainer::getCount() const
 {
     SolarMutexGuard g;
     return( (sal_uInt32)m_aContainer.size() );
 }
 
-/**-***************************************************************************************************************
+/**
     @short      returns one item of this container
     @deprecated This value can't be guaranteed for multithreading environments.
                 So it will be marked as deprecated and should be replaced by "getAllElements()".
@@ -155,7 +155,7 @@ sal_uInt32 FrameContainer::getCount() const
     @return     a reference to a frame inside the container, which match with given index
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32 nIndex ) const
 {
 
@@ -176,21 +176,21 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32
     return xFrame;
 }
 
-/**-***************************************************************************************************************
+/**
     @short      returns a snapshot of all currently existing frames inside this container
     @descr      Should be used to replace the deprecated functions getCount()/operator[]!
 
     @return     a list of all frame references inside this container
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer::getAllElements() const
 {
     SolarMutexGuard g;
     return comphelper::containerToSequence(m_aContainer);
 }
 
-/**-***************************************************************************************************************
+/**
     @short      set the given frame as  the new active one inside this container
     @descr      We accept this frame only, if it's already a part of this container.
 
@@ -199,7 +199,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer::
                     Must be a valid reference and already part of this container.
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 void FrameContainer::setActive( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
     if ( !xFrame.is() || exist(xFrame) )
@@ -209,7 +209,7 @@ void FrameContainer::setActive( const css::uno::Reference< css::frame::XFrame >&
     }
 }
 
-/**-***************************************************************************************************************
+/**
     @short      return the current active frame of this container
     @descr      Value can be null in case the frame was removed from the container and nobody
                 from outside decide which of all others should be the new one...
@@ -218,29 +218,30 @@ void FrameContainer::setActive( const css::uno::Reference< css::frame::XFrame >&
                 Value can be NULL!
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const
 {
     SolarMutexGuard g;
     return m_xActiveFrame;
 }
 
-/**-***************************************************************************************************************
+/**
     @short      implements a simple search based on current container items
     @descr      It can be used for findFrame() and implements a deep down search.
 
     @param      sName
-                    target name, which is searched
+                    recipient name which is searched
 
     @return     reference to the found frame or NULL if not.
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const OUString& sName ) const
 {
     SolarMutexGuard g;
-    // Step over all child frames. But if direct child isn't the right one search on his children first - before
-    // you go to next direct child of this container!
+
+    // Step over all child frames
+
     css::uno::Reference< css::frame::XFrame > xSearchedFrame;
     for( TFrameContainer::const_iterator pIterator=m_aContainer.begin(); pIterator!=m_aContainer.end(); ++pIterator )
     {
@@ -251,25 +252,28 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens(
         }
         else
         {
-            xSearchedFrame = (*pIterator)->findFrame( sName, css::frame::FrameSearchFlag::CHILDREN );
+            // a direct child isn't the one sought-for thus search on its children first - before
+            // moving to next direct child
+            xSearchedFrame = (*pIterator)->findFrame( sName, css::frame::FrameSearchOption::Children );
             if (xSearchedFrame.is())
                 break;
         }
     }
+
     return xSearchedFrame;
 }
 
-/**-***************************************************************************************************************
+/**
     @short      implements a simple search based on current container items
     @descr      It can be used for findFrame() and search on members of this container only!
 
     @param      sName
-                    target name, which is searched
+                    recipient name which is searched
 
     @return     reference to the found frame or NULL if not.
 
     @threadsafe yes
- *****************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const OUString& sName ) const
 {
     SolarMutexGuard g;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 3bc3b1e..3753ee7 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <classes/taskcreator.hxx>
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 #include <services.h>
 #include <taskcreatordefs.hxx>
 
@@ -33,30 +33,30 @@
 
 namespace framework{
 
-/*-****************************************************************************************************
+/*
     @short      initialize instance with necessary information
     @descr      We need a valid uno service manager to create or instanciate new services.
                 All other information to create frames or tasks come in on right interface methods.
 
     @param      xContext
                     points to the valid uno service manager
-*//*-*****************************************************************************************************/
+*/
 TaskCreator::TaskCreator( const css::uno::Reference< css::uno::XComponentContext >& xContext )
     : m_xContext    ( xContext )
 {
 }
 
-/*-****************************************************************************************************
+/*
     @short      deinitialize instance
     @descr      We should release all used resource which are not needed any longer.
-*//*-*****************************************************************************************************/
+*/
 TaskCreator::~TaskCreator()
 {
 }
 
-/*-****************************************************************************************************
+/*
     TODO document me
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName )
 {
     css::uno::Reference< css::lang::XSingleServiceFactory > xCreator;
@@ -65,8 +65,8 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin
     try
     {
         if (
-            ( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_BLANK  ) ) ||
-            ( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_DEFAULT) )
+            ( DeliveryHelper::isSpecialRecipient( sName, DeliveryHelper::E_BLANK  ) ) ||
+            ( DeliveryHelper::isSpecialRecipient( sName, DeliveryHelper::E_DEFAULT) )
            )
         {
 
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 991c3e9..6574004 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -55,18 +55,18 @@ const char URL_CLOSEFRAME[] = ".uno:CloseFrame";
 
 CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
                                  const css::uno::Reference< css::frame::XFrame >&          xFrame ,
-                                 const OUString&                                           sTarget)
+                                 const OUString&                                           sRecipient )
     : m_xContext         (rxContext                                       )
     , m_aAsyncCallback(
         new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback)))
     , m_eOperation(E_CLOSE_DOC)
     , m_pSysWindow(nullptr)
 {
-    uno::Reference<frame::XFrame> xTarget = static_impl_searchRightTargetFrame(xFrame, sTarget);
-    m_xCloseFrame = xTarget;
+    uno::Reference< frame::XFrame > xRecipient = static_impl_lookForRecipientFrame( xFrame, sRecipient );
+    m_xCloseFrame = xRecipient;
 
-    // Try to retrieve the system window instance of the closing frame.
-    uno::Reference<awt::XWindow> xWindow = xTarget->getContainerWindow();
+    // Try to retrieve the instance of system window of the closing frame
+    uno::Reference<awt::XWindow> xWindow = xRecipient->getContainerWindow();
     if (xWindow.is())
     {
         vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
@@ -565,23 +565,23 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css
     xListener->dispatchFinished(aEvent);
 }
 
-css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
-                                                                                              const OUString&                           sTarget)
+css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_lookForRecipientFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ,
+                                                                                              const OUString& sRecipient )
 {
-    if (sTarget.equalsIgnoreAsciiCase("_self"))
+    if ( sRecipient.equalsIgnoreAsciiCase( "_self" ) )
         return xFrame;
 
-    OSL_ENSURE(sTarget.isEmpty(), "CloseDispatch used for unexpected target. Magic things will happen now .-)");
+    OSL_ENSURE( sRecipient.isEmpty(), "CloseDispatch used for unexpected recipient. Magic things will happen now .-)" );
 
-    css::uno::Reference< css::frame::XFrame > xTarget = xFrame;
+    css::uno::Reference< css::frame::XFrame > xRecipient = xFrame;
     while(true)
     {
-        // a) top frames wil be closed
-        if (xTarget->isTop())
-            return xTarget;
+        // a) close recipient frame if it's on top
+        if ( xRecipient->isTop() )
+            return xRecipient;
 
         // b) even child frame containing top level windows (e.g. query designer of database) will be closed
-        css::uno::Reference< css::awt::XWindow >    xWindow        = xTarget->getContainerWindow();
+        css::uno::Reference< css::awt::XWindow >    xWindow        = xRecipient->getContainerWindow();
         css::uno::Reference< css::awt::XTopWindow > xTopWindowCheck(xWindow, css::uno::UNO_QUERY);
         if (xTopWindowCheck.is())
         {
@@ -592,22 +592,19 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig
             //     a simple XWindow using the toolkit only .-(
             SolarMutexGuard aSolarLock;
             vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if (
-                (pWindow                  ) &&
-                (pWindow->IsSystemWindow())
-               )
-                return xTarget;
+            if ( pWindow  &&  pWindow->IsSystemWindow() )
+                return xRecipient;
         }
 
         // c) try to find better results on parent frame
         //    If no parent frame exists (because this frame is used outside the desktop tree)
         //    the given frame must be used directly.
-        css::uno::Reference< css::frame::XFrame > xParent(xTarget->getCreator(), css::uno::UNO_QUERY);
+        css::uno::Reference< css::frame::XFrame > xParent(xRecipient->getCreator(), css::uno::UNO_QUERY);
         if ( ! xParent.is())
-            return xTarget;
+            return xRecipient;
 
         // c1) check parent frame inside next loop ...
-        xTarget = xParent;
+        xRecipient = xParent;
     }
 }
 
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 397855f..239f6e9 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -28,12 +28,12 @@
 #include <threadhelp/transactionguard.hxx>
 #include <protocols.h>
 #include <services.h>
-#include <targets.h>
+#include <recipients.h>
 #include <general.h>
 #include <isstartmoduledispatch.hxx>
 
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/ucb/XContentProviderManager.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
@@ -87,17 +87,17 @@ DispatchProvider::~DispatchProvider()
 
     @param      aURL
                     URL to dispatch.
-    @param      sTargetFrameName
+    @param      sRecipientFrameName
                     name of searched frame.
-    @param      nSearchFlags
-                    flags for searching.
+    @param      nSearchOptions
+                    options of search.
     @return     A reference to a dispatch object for this URL (if someone was found!).
 
     @threadsafe yes
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL&  aURL             ,
-                                                                                       const OUString& sTargetFrameName ,
-                                                                                             sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+                                                                                       const OUString& sRecipientFrameName ,
+                                                                                             sal_Int32  nSearchOptions   ) throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
 
@@ -105,10 +105,10 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis
 
     css::uno::Reference< css::frame::XDesktop > xDesktopCheck( xOwner, css::uno::UNO_QUERY );
 
-    if (xDesktopCheck.is())
-        xDispatcher = implts_queryDesktopDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags);
+    if ( xDesktopCheck.is() )
+        xDispatcher = implts_queryDesktopDispatch( xOwner, aURL, sRecipientFrameName, nSearchOptions );
     else
-        xDispatcher = implts_queryFrameDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags);
+        xDispatcher = implts_queryFrameDispatch( xOwner, aURL, sRecipientFrameName, nSearchOptions );
 
     return xDispatcher;
 }
@@ -130,9 +130,9 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis
 */
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception )
 {
-    // Create return list - which must have same size then the given descriptor
-    // It's not allowed to pack it!
-    sal_Int32                                                          nCount     = lDescriptions.getLength();
+    // Create return list with the same size as the given descriptor
+    // This list is not packed
+    sal_Int32 nCount = lDescriptions.getLength();
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
 
     // Step over all descriptors and try to get any dispatcher for it.
@@ -148,23 +148,23 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp
 
 /**
     @short      helper for queryDispatch()
-    @descr      Every member of the frame tree (frame, desktop) must handle such request
-                in another way. So we implement different specialized methods for every one.
+    @descr      Every member of the frame tree (frame, desktop) is supposed to handle such request
+                in another way. So implement different specialized methods for every one.
 
     @threadsafe yes
  */
 css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDesktopDispatch( const css::uno::Reference< css::frame::XFrame >& xDesktop         ,
                                                                                             const css::util::URL&                           aURL             ,
-                                                                                            const OUString&                          sTargetFrameName ,
-                                                                                                  sal_Int32                                 nSearchFlags     )
+                                                                                            const OUString&                          sRecipientFrameName ,
+                                                                                                  sal_Int32                             nSearchOptions    )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
 
-    // ignore wrong requests which are not supported
+    // ignore requests which are not supported
     if (
-        (sTargetFrameName==SPECIALTARGET_PARENT   )   ||    // we have no parent by definition
-        (sTargetFrameName==SPECIALTARGET_BEAMER   )         // beamer frames are allowed as child of tasks only -
-                                                            // and they exist more than ones. We have no idea which our sub tasks is the right one
+         ( sRecipientFrameName == SPECIAL_PARENT )   ||    // no parent by definition
+         ( sRecipientFrameName == SPECIAL_BEAMER )        // beamer frames are allowed as child of tasks only -
+                                                         // and they exist more than ones. No idea which sub task is used
        )
     {
         return nullptr;
@@ -178,7 +178,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
     //  Normally the functionality for "_blank" is provided by findFrame() - but that would create it directly
     //  here. Thats why we must "intercept" here.
 
-    if (sTargetFrameName==SPECIALTARGET_BLANK)
+    if ( sRecipientFrameName == SPECIAL_BLANK )
     {
         if (implts_isLoadableContent(aURL))
             xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop );
@@ -187,7 +187,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
     // I.II) "_default"
     //  This is a combination of search an empty task for recycling - or create a new one.
 
-    else if (sTargetFrameName==SPECIALTARGET_DEFAULT)
+    else if ( sRecipientFrameName == SPECIAL_DEFAULT )
     {
         if (implts_isLoadableContent(aURL))
             xDispatcher = implts_getOrCreateDispatchHelper( E_DEFAULTDISPATCHER, xDesktop );
@@ -199,52 +199,51 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
     // I.III) "_self", "", "_top"
     //  The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ...
     //  Why is "top" here handled too? Because the desktop is the topest frame. Normally it's superflous
-    //  to use this target - but we can handle it in the same manner then "_self".
+    //  to use this recipient - thus handle it in the same manner as "_self".
 
     else if (
-             (sTargetFrameName==SPECIALTARGET_SELF)  ||
-             (sTargetFrameName==SPECIALTARGET_TOP )  ||
-             (sTargetFrameName.isEmpty())
+              ( sRecipientFrameName == SPECIAL_SELF )  ||
+              ( sRecipientFrameName == SPECIAL_TOP )   ||
+              ( sRecipientFrameName.isEmpty() )
             )
     {
         xDispatcher = implts_searchProtocolHandler(aURL);
     }
 
-    // I.IV) no further special targets exist
-    //  Now we have to search for the right target frame by calling findFrame() - but should provide our code
-    //  against creation of a new task if no frame could be found.
-    //  I said it before - it's allowed for dispatch() only.
+    // I.IV) no further special recipients exist
+    //  Now search for the recipient frame via findFrame() but don't create a new task if no frame could be found.
+    //  I said it before - it's for dispatch() only.
 
     else
     {
-        sal_Int32 nRightFlags  = nSearchFlags;
-                  nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+        sal_Int32 nOptions  = nSearchOptions;
+                  nOptions &= ~css::frame::FrameSearchOption::Create;
 
-        // try to find any existing target and ask him for his dispatcher
-        css::uno::Reference< css::frame::XFrame > xFoundFrame = xDesktop->findFrame(sTargetFrameName, nRightFlags);
-        if (xFoundFrame.is())
+        // try to find any existing recipient and ask him for his dispatcher
+        css::uno::Reference< css::frame::XFrame > xFoundFrame = xDesktop->findFrame( sRecipientFrameName, nOptions );
+        if ( xFoundFrame.is() )
         {
             css::uno::Reference< css::frame::XDispatchProvider > xProvider( xFoundFrame, css::uno::UNO_QUERY );
-            xDispatcher = xProvider->queryDispatch(aURL,SPECIALTARGET_SELF,0);
+            xDispatcher = xProvider->queryDispatch( aURL, SPECIAL_SELF, 0 );
         }
         // if it couldn't be found - but creation was allowed
         // use special dispatcher for creation or forwarding to the browser
-        else if (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
-            xDispatcher = implts_getOrCreateDispatchHelper( E_CREATEDISPATCHER, xDesktop, sTargetFrameName, nSearchFlags );
+        else if ( nSearchOptions & css::frame::FrameSearchOption::Create )
+            xDispatcher = implts_getOrCreateDispatchHelper( E_CREATEDISPATCHER, xDesktop, sRecipientFrameName, nSearchOptions );
     }
 
     return xDispatcher;
 }
 
-css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame >& xFrame           ,
-                                                                                          const css::util::URL&                           aURL             ,
-                                                                                          const OUString&                          sTargetFrameName ,
-                                                                                                sal_Int32                                 nSearchFlags     )
+css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame >& xFrame         ,
+                                                                                          const css::util::URL&                        aURL            ,
+                                                                                          const OUString&                          sFrameName ,
+                                                                                                sal_Int32                 nSearchOptions     )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
 
-    // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "".
-    //    But they are specified to use her own fix target. Detect such URLs here and use the correct target.
+    // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default recipient "".
+    //    But they are specified to use her own fix recipients. Deal with such URLs here and use the suitable recipient.
 
     // I) handle special cases which not right for using findFrame() first
 
@@ -254,59 +253,61 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     //  here. Thats why we must "intercept" here.
 
     if (
-        (sTargetFrameName==SPECIALTARGET_BLANK  ) ||
-        (sTargetFrameName==SPECIALTARGET_DEFAULT)
+         ( sFrameName == SPECIAL_BLANK   ) ||
+         ( sFrameName == SPECIAL_DEFAULT )
        )
     {
         css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
         if (xParent.is())
-            xDispatcher = xParent->queryDispatch(aURL, sTargetFrameName, 0); // it's a special target - ignore search flags
+            xDispatcher = xParent->queryDispatch( aURL, sFrameName, 0 ); // it's a special recipient so ignore search options
     }
 
     // I.II) "_beamer"
-    //  Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI.
+    //  Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit hacki.
     //  Only the sfx (means the controller) can create it.
 
-    else if (sTargetFrameName==SPECIALTARGET_BEAMER)
+    else if ( sFrameName == SPECIAL_BEAMER )
     {
-        css::uno::Reference< css::frame::XDispatchProvider > xBeamer( xFrame->findFrame( SPECIALTARGET_BEAMER, css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::SELF ), css::uno::UNO_QUERY );
-        if (xBeamer.is())
+        css::uno::Reference< css::frame::XDispatchProvider > xBeamer(
+                xFrame->findFrame( SPECIAL_BEAMER, css::frame::FrameSearchOption::Children | css::frame::FrameSearchOption::Self )
+              , css::uno::UNO_QUERY );
+        if ( xBeamer.is() )
         {
-            xDispatcher = xBeamer->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
+            xDispatcher = xBeamer->queryDispatch( aURL, SPECIAL_SELF, 0 );
         }
         else
         {
             css::uno::Reference< css::frame::XDispatchProvider > xController( xFrame->getController(), css::uno::UNO_QUERY );
             if (xController.is())
-                // force using of special target - but use original search flags
-                // May the caller used the CREATE flag or not!
-                xDispatcher = xController->queryDispatch(aURL, SPECIALTARGET_BEAMER, nSearchFlags);
+                // use special recipient with original options for search
+                // may the caller used the CREATE option or not
+                xDispatcher = xController->queryDispatch( aURL, SPECIAL_BEAMER, nSearchOptions );
         }
     }
 
     // I.IV) "_parent"
-    //  Our parent frame (if it exist) should handle this URL.
+    //  The parent frame (if it exist) is supposed to handle this URL.
 
-    else if (sTargetFrameName==SPECIALTARGET_PARENT)
+    else if ( sFrameName == SPECIAL_PARENT )
     {
         css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
         if (xParent.is())
             // SELF => we must address the parent directly... and not his parent or any other parent!
-            xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
+            xDispatcher = xParent->queryDispatch( aURL, SPECIAL_SELF, 0 );
     }
 
     // I.V) "_top"
     //  This request must be forwarded to any parent frame, till we reach a top frame.
     //  If no parent exist, we can handle itself.
 
-    else if (sTargetFrameName==SPECIALTARGET_TOP)
+    else if ( sFrameName == SPECIAL_TOP )
     {
         if (xFrame->isTop())
         {
             // If we are this top frame itself (means our owner frame)
-            // we should call ourself recursiv with a better target "_self".
+            // we should call ourself recursiv with a better recipient "_self".
             // So we can share the same code! (see reaction for "_self" inside this method too.)
-            xDispatcher = this->queryDispatch(aURL,SPECIALTARGET_SELF,0);
+            xDispatcher = this->queryDispatch( aURL, SPECIAL_SELF, 0 );
         }
         else
         {
@@ -314,7 +315,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             // Normally if isTop() returned sal_False ... the parent frame MUST(!) exist ...
             // But it seems to be better to check that here to prevent us against an access violation.
             if (xParent.is())
-                xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_TOP, 0);
+                xDispatcher = xParent->queryDispatch( aURL, SPECIAL_TOP, 0 );
         }
     }
 
@@ -325,8 +326,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     //  we load it into the frame by returning specilized dispatch object.
 
     else if (
-             (sTargetFrameName==SPECIALTARGET_SELF)  ||
-             (sTargetFrameName.isEmpty())
+              ( sFrameName == SPECIAL_SELF )  ||
+              ( sFrameName.isEmpty() )
             )
     {
         // There exist a hard coded interception for special URLs.
@@ -341,7 +342,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
                 !VCLUnoHelper::GetWindow(xFrame->getContainerWindow())->IsSystemWindow() &&
                 xParent.is()
                )
-                xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
+                xDispatcher = xParent->queryDispatch( aURL, SPECIAL_SELF, 0 );
             else
                 xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
         }
@@ -355,7 +356,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             // But in case of e.g. the bibliography not all queries will be handled successfully here.
             css::uno::Reference< css::frame::XDispatchProvider > xController( xFrame->getController(), css::uno::UNO_QUERY );
             if (xController.is())
-                xDispatcher = xController->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
+                xDispatcher = xController->queryDispatch( aURL, SPECIAL_SELF, 0 );
         }
 
         // If controller has no fun to dispatch these URL - we must search another right dispatcher.
@@ -379,44 +380,40 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     }
 
     // I.VII) no further special handlings exist
-    //  Now we have to search for the right target frame by calling findFrame() - but should provide our code
-    //  against creation of a new task if no frame could be found.
-    //  I said it before - it's allowed for dispatch() only.
+    //  Now search for the recipient frame via findFrame() but don't create a new task if no frame could be found.
+    //  I said it before - it's for dispatch() only.
 
     else
     {
-        sal_Int32 nRightFlags  = nSearchFlags;
-                  nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+        sal_Int32 nOptions = nSearchOptions;
+                  nOptions &= ~css::frame::FrameSearchOption::Create;
 
-        // try to find any existing target and ask him for his dispatcher
-        css::uno::Reference< css::frame::XFrame > xFoundFrame = xFrame->findFrame(sTargetFrameName, nRightFlags);
-        if (xFoundFrame.is())
+        // try to find any existing recipient and ask him for his dispatcher
+        css::uno::Reference< css::frame::XFrame > xFoundFrame = xFrame->findFrame( sFrameName, nOptions );
+
+        if ( xFoundFrame.is() )
         {
-            // Attention: Found target is our own owner frame!
-            // Don't ask him for his dispatcher. We know it already - it's our self dispatch helper.
-            // Otherwhise we can start a never ending recursiv call. Why?
-            // Somewere called our owner frame - he called some interceptor objects - and may by this dispatch provider
-            // is called. If wa use queryDispatch() on our owner frame again - we start this call stack again ... and again.
+            // Oops: Found recipient is own parent frame
+            // Don't ask him for his dispatcher - it's self dispatch helper.
+            // Otherwhise it begins a never ending recursive call.
             if (xFoundFrame==xFrame)
                 xDispatcher = implts_getOrCreateDispatchHelper( E_SELFDISPATCHER, xFrame );
             else
             {
                 css::uno::Reference< css::frame::XDispatchProvider > xProvider( xFoundFrame, css::uno::UNO_QUERY );
-                xDispatcher = xProvider->queryDispatch(aURL,SPECIALTARGET_SELF,0);
+                xDispatcher = xProvider->queryDispatch( aURL, SPECIAL_SELF, 0 );
             }
         }
         else
-        // if it couldn't be found - but creation was allowed
-        // forward request to the desktop.
-        // Note: The given target name must be used to set the name on new created task!
+        // if it couldn't be found -  forward request to the desktop.
+        // Note: The given recipient name is supposed to set the name on new created task
         //       Don't forward request by changing it to a special one e.g _blank.
-        //       Use the CREATE flag only to prevent call against further searches.
-        //       We already know it - the target must be created new.
-        if (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
+        //       The CREATE option is used just to away from further searches.
+        if ( nOptions & css::frame::FrameSearchOption::Create )
         {
             css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
             if (xParent.is())
-                xDispatcher = xParent->queryDispatch(aURL, sTargetFrameName, css::frame::FrameSearchFlag::CREATE);
+                xDispatcher = xParent->queryDispatch( aURL, sFrameName, css::frame::FrameSearchOption::Create );
         }
     }
 
@@ -481,7 +478,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
 
         // ask for his (sub)dispatcher for the given URL
         if (xHandler.is())
-            xDispatcher = xHandler->queryDispatch(aURL,SPECIALTARGET_SELF,0);
+            xDispatcher = xHandler->queryDispatch( aURL, SPECIAL_SELF, 0 );
     }
 
     return xDispatcher;
@@ -494,26 +491,25 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
                 We should create it on demand ...
                 Thats why we implement this method. It return an already existing helper or create a new one otherwise.
 
-    @attention  The parameter sTarget and nSearchFlags are defaulted to "" and 0!
-                Please use it only, if you can be sure, that the really given by the outside calli!
-                Mostly it depends from the parameter eHelper is they are required or not.
+    @note       The parameter sRecipient and nSearchOptions are defaulted to "" and 0
+                Parameter eHelper decides is they are expected to exist or not
 
     @param      eHelper
                     specify the requested dispatch helper
     @param      xOwner
-                    the target of possible dispatch() call on created dispatch helper
-    @param      sTarget
-                    the target parameter of the original queryDispatch() request
-    @param      nSearchFlags
-                    the flags parameter of the original queryDispatch() request
+                    the recipient of possible dispatch() call on created dispatch helper
+    @param      sRecipient
+                    the recipient parameter of the original queryDispatch()
+    @param      nSearchOptions
+                    the options of the original queryDispatch()
     @return     A reference to a dispatch helper.
 
     @threadsafe yes
 */
-css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper                                  eHelper     ,
-                                                                                                 const css::uno::Reference< css::frame::XFrame >& xOwner      ,
-                                                                                                 const OUString&                           sTarget     ,
-                                                                                                 sal_Int32                                  nSearchFlags)
+css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper                                  eHelper ,
+                                                                                                 const css::uno::Reference< css::frame::XFrame >& xOwner ,
+                                                                                                 const OUString& sRecipient ,
+                                                                                                 sal_Int32 nSearchOptions )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatchHelper;
 
@@ -521,7 +517,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
     {
         case E_CREATEDISPATCHER :
                 {
-                    LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, sTarget, nSearchFlags);
+                    LoadDispatcher* pDispatcher = new LoadDispatcher( m_xContext, xOwner, sRecipient, nSearchOptions );
                     xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
@@ -531,7 +527,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     css::uno::Reference< css::frame::XFrame > xDesktop( xOwner, css::uno::UNO_QUERY );
                     if (xDesktop.is())
                     {
-                        LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_BLANK, 0);
+                        LoadDispatcher* pDispatcher = new LoadDispatcher( m_xContext, xOwner, SPECIAL_BLANK, 0 );
                         xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
                 }
@@ -542,7 +538,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     css::uno::Reference< css::frame::XFrame > xDesktop( xOwner, css::uno::UNO_QUERY );
                     if (xDesktop.is())
                     {
-                        LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_DEFAULT, 0);
+                        LoadDispatcher* pDispatcher = new LoadDispatcher( m_xContext, xOwner, SPECIAL_DEFAULT, 0 );
                         xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
                 }
@@ -550,14 +546,14 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
 
         case E_SELFDISPATCHER :
                 {
-                    LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_SELF, 0);
+                    LoadDispatcher* pDispatcher = new LoadDispatcher( m_xContext, xOwner, SPECIAL_SELF, 0 );
                     xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
 
         case E_CLOSEDISPATCHER :
                 {
-                    CloseDispatcher* pDispatcher = new CloseDispatcher( m_xContext, xOwner, sTarget );
+                    CloseDispatcher* pDispatcher = new CloseDispatcher( m_xContext, xOwner, sRecipient );
                     xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
@@ -575,9 +571,9 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
 
 /**
     @short      check URL for support by our used loader or handler
-    @descr      If we must return our own dispatch helper implementations (self, blank, create dispatcher!)
-                we should be sure, that URL describe any loadable content. Otherwise slot/uno URLs
-                will be detected... but there exist nothing for real loading into a target frame!
+    @descr      Be sure that URL of own dispatch helper implementations (self, blank, create dispatcher)
+                describe any loadable content. Otherwise slot/uno URLs are found...
+                but there exist nothing for real loading into a recipient frame
 
     @param      aURL
                     URL which should be "detected"
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index f3736de..48cedba 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -26,9 +26,9 @@
 namespace framework{
 
 InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >&            xOwner,
-                                       const css::uno::Reference< css::frame::XDispatchProvider >& xSlave)
-    : m_xOwnerWeak  (xOwner                       )
-    , m_xSlave      (xSlave                       )
+                                       const css::uno::Reference< css::frame::XDispatchProvider >& xServant )
+    : m_xOwnerWeak  ( xOwner )
+    , m_xServant    ( xServant )
 {
 }
 
@@ -37,8 +37,8 @@ InterceptionHelper::~InterceptionHelper()
 }
 
 css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL&  aURL            ,
-                                                                                        const OUString& sTargetFrameName,
-                                                                                              sal_Int32        nSearchFlags    )
+                                                                                        const OUString& sRecipientFrameName,
+                                                                                              sal_Int32        nSearchOptions    )
     throw(css::uno::RuntimeException, std::exception)
 {
     // SAFE {
@@ -69,18 +69,18 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
         // registered for this command url (we already searched for matching
         // patterns above)
     }
-    // c) No registered interceptor => use our direct slave.
+    // c) No registered interceptor then use direct servant
     //    This helper exist by design and must be valid everytimes ...
     //    But to be more feature proof - we should check that .-)
-    if (!xInterceptor.is() && m_xSlave.is())
-        xInterceptor = m_xSlave;
+    if (!xInterceptor.is() && m_xServant.is())
+        xInterceptor = m_xServant;
 
     aReadLock.clear();
     // } SAFE
 
     css::uno::Reference< css::frame::XDispatch > xReturn;
     if (xInterceptor.is())
-        xReturn = xInterceptor->queryDispatch(aURL, sTargetFrameName, nSearchFlags);
+        xReturn = xInterceptor->queryDispatch(aURL, sRecipientFrameName, nSearchOptions);
     return xReturn;
 }
 
@@ -92,8 +92,8 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Inte
           css::uno::Reference< css::frame::XDispatch >*                      pDispatches = lDispatches.getArray();
     const css::frame::DispatchDescriptor*                                    pDescriptor = lDescriptor.getConstArray();
 
-    for (sal_Int32 i=0; i<c; ++i)
-        pDispatches[i] = queryDispatch(pDescriptor[i].FeatureURL, pDescriptor[i].FrameName, pDescriptor[i].SearchFlags);
+    for ( sal_Int32 i = 0; i < c; ++i )
+        pDispatches[i] = queryDispatch( pDescriptor[i].FeatureURL, pDescriptor[i].FrameName, pDescriptor[i].SearchFlags );
 
     return lDispatches;
 }
@@ -125,28 +125,28 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
     SolarMutexClearableGuard aWriteLock;
 
     // a) no interceptor at all - set this instance as master for given interceptor
-    //    and set our slave as its slave - and put this interceptor to the list.
+    //    and set the servant as its one - and put this interceptor to the list.
     //    Its place there doesn't matter. Because this list is currently empty.
     if (m_lInterceptionRegs.empty())
     {
-        xInterceptor->setMasterDispatchProvider(xThis   );
-        xInterceptor->setSlaveDispatchProvider (m_xSlave);
+        xInterceptor->setMasterDispatchProvider( xThis );
+        xInterceptor->setSlaveDispatchProvider( m_xServant );
         m_lInterceptionRegs.push_back(aInfo);
     }
 
     // b) OK - there is at least one interceptor already registered.
-    //    It's slave and it's master must be valid references ...
-    //    because we created it.
+    //    Its servant and its master are valid references ...
+    //    because I created it.
 
     // insert it before any other existing interceptor - means at the beginning of our list.
     else
     {
-        css::uno::Reference< css::frame::XDispatchProvider >            xSlaveD = m_lInterceptionRegs.begin()->xInterceptor;
-        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xSlaveI (xSlaveD , css::uno::UNO_QUERY);
+        css::uno::Reference< css::frame::XDispatchProvider >            xServantD = m_lInterceptionRegs.begin()->xInterceptor;
+        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xServantI ( xServantD , css::uno::UNO_QUERY );
 
-        xInterceptor->setMasterDispatchProvider(xThis             );
-        xInterceptor->setSlaveDispatchProvider (xSlaveD           );
-        xSlaveI->setMasterDispatchProvider     (aInfo.xInterceptor);
+        xInterceptor->setMasterDispatchProvider( xThis );
+        xInterceptor->setSlaveDispatchProvider( xServantD );
+        xServantI->setMasterDispatchProvider( aInfo.xInterceptor );
 
         m_lInterceptionRegs.push_front(aInfo);
     }
@@ -175,22 +175,22 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::
 
     // search this interceptor ...
     // If it could be located inside cache -
-    // use its slave/master relations to update the interception list;
-    // set empty references for it as new master and slave;
+    // use its servant & master relations to update the interception list;
+    // set empty references for it as new master and servant;
     // and release it from out cache.
     InterceptorList::iterator pIt = m_lInterceptionRegs.findByReference(xInterceptor);
     if (pIt != m_lInterceptionRegs.end())
     {
-        css::uno::Reference< css::frame::XDispatchProvider >            xSlaveD  (xInterceptor->getSlaveDispatchProvider() , css::uno::UNO_QUERY);
-        css::uno::Reference< css::frame::XDispatchProvider >            xMasterD (xInterceptor->getMasterDispatchProvider(), css::uno::UNO_QUERY);
-        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xSlaveI  (xSlaveD                                  , css::uno::UNO_QUERY);
-        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xMasterI (xMasterD                                 , css::uno::UNO_QUERY);
+        css::uno::Reference< css::frame::XDispatchProvider >            xServantD ( xInterceptor->getSlaveDispatchProvider() , css::uno::UNO_QUERY );
+        css::uno::Reference< css::frame::XDispatchProvider >            xMasterD  ( xInterceptor->getMasterDispatchProvider(), css::uno::UNO_QUERY );
+        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xServantI ( xServantD, css::uno::UNO_QUERY );
+        css::uno::Reference< css::frame::XDispatchProviderInterceptor > xMasterI  ( xMasterD, css::uno::UNO_QUERY );
 
-        if (xMasterI.is())
-            xMasterI->setSlaveDispatchProvider(xSlaveD);
+        if ( xMasterI.is() )
+            xMasterI->setSlaveDispatchProvider( xServantD );
 
-        if (xSlaveI.is())
-            xSlaveI->setMasterDispatchProvider(xMasterD);
+        if ( xServantI.is() )
+            xServantI->setMasterDispatchProvider( xMasterD ) ;
 
         xInterceptor->setSlaveDispatchProvider (css::uno::Reference< css::frame::XDispatchProvider >());
         xInterceptor->setMasterDispatchProvider(css::uno::Reference< css::frame::XDispatchProvider >());
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 4e90a3a..ff2ce24 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -25,12 +25,12 @@ namespace framework{
 
 LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext    ,
                                const css::uno::Reference< css::frame::XFrame >&          xOwnerFrame ,
-                               const OUString&                                           sTargetName ,
-                                     sal_Int32                                           nSearchFlags)
+                               const OUString&                                           sName ,
+                                     sal_Int32                                           nSearchOptions)
     : m_xContext    (xContext    )
     , m_xOwnerFrame (xOwnerFrame )
-    , m_sTarget     (sTargetName )
-    , m_nSearchFlags(nSearchFlags)
+    , m_sRecipient ( sName )
+    , m_nSearchOptions(nSearchOptions)
     , m_aLoader     (xContext    )
 {
 }
@@ -111,10 +111,10 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL,
     css::uno::Reference< css::lang::XComponent > xComponent;
     try
     {
-        m_aLoader.initializeLoading( rURL.Complete, lArguments, xBaseFrame, m_sTarget, m_nSearchFlags, (LoadEnv::EFeature)(LoadEnv::E_ALLOW_CONTENTHANDLER | LoadEnv::E_WORK_WITH_UI));
+        m_aLoader.initializeLoading( rURL.Complete, lArguments, xBaseFrame, m_sRecipient, m_nSearchOptions, (LoadEnv::EFeature)(LoadEnv::E_ALLOW_CONTENTHANDLER | LoadEnv::E_WORK_WITH_UI));
         m_aLoader.startLoading();
-        m_aLoader.waitWhileLoading(); // wait for ever!
-        xComponent = m_aLoader.getTargetComponent();
+        m_aLoader.waitWhileLoading(); // wait for ever
+        xComponent = m_aLoader.getReceivingComponent();
 
         // TODO thinking about asynchronous operations and listener support
     }
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 48d498e..9b1655b 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -75,8 +75,8 @@ MailToDispatcher::~MailToDispatcher()
                 at the same implementation.
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL&  aURL    ,
-                                                                                       const OUString& /*sTarget*/ ,
-                                                                                             sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException, std::exception )
+                                                                                       const OUString& /*sRecipient*/ ,
+                                                                                             sal_Int32        /*nOptions*/  ) throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
     if (aURL.Complete.startsWith("mailto:"))
@@ -96,7 +96,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
         lDispatcher[i] = this->queryDispatch(
                             lDescriptor[i].FeatureURL,
                             lDescriptor[i].FrameName,
-                            lDescriptor[i].SearchFlags);
+                            lDescriptor[i].SearchFlags );
     }
     return lDispatcher;
 }
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index bd19c85..b5ea720 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -44,7 +44,7 @@ DEFINE_INIT_SERVICE                 (   Oxt_Handler,
                                         }
                                     )
 
-/*-************************************************************************************************************
+/*
     @short      standard ctor
     @descr      These initialize a new instance of this class with needed information for work.
 
@@ -53,15 +53,15 @@ DEFINE_INIT_SERVICE                 (   Oxt_Handler,
     @param      "xFactory", reference to service manager for creation of new services
     @onerror    Show an assertion and do nothing else.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
         :   m_xFactory          ( xFactory )
 {
 }
 
-/*-************************************************************************************************************
+/*
     @short      standard dtor
-*//*-*************************************************************************************************************/
+*/
 Oxt_Handler::~Oxt_Handler()
 {
     if ( m_xListener.is() )
@@ -73,7 +73,7 @@ Oxt_Handler::~Oxt_Handler()
     }
 }
 
-/*-************************************************************************************************************
+/*
     @interface  css::frame::XDispatch
 
     @short      try to load audio file
@@ -92,7 +92,7 @@ Oxt_Handler::~Oxt_Handler()
     @param      "lArguments", list of optional arguments.
     @onerror    We do nothing.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
                                                      const css::uno::Sequence< css::beans::PropertyValue >&            /*lArguments*/,
                                                      const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@@ -126,7 +126,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
     dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  css::document::XExtendedFilterDetection
 
     @short      try to detect file (given as argument included in "lDescriptor")
@@ -146,7 +146,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
 
     @onerror    We return nothing.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
     throw( css::uno::RuntimeException, std::exception )
 {
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 3723f32..39617f5 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -160,8 +160,8 @@ throw( css::uno::Exception, css::uno::RuntimeException, std::exception)
 css::uno::Reference< css::frame::XDispatch >
 SAL_CALL PopupMenuDispatcher::queryDispatch(
     const css::util::URL&  rURL    ,
-    const OUString& sTarget ,
-    sal_Int32              nFlags  )
+    const OUString& sRecipient ,
+    sal_Int32              nOptions  )
 throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
@@ -207,7 +207,7 @@ throw( css::uno::RuntimeException, std::exception )
 
                 // Ask popup menu dispatch provider for dispatch object
                 if ( xDispatchProvider.is() )
-                    xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget, nFlags );
+                    xDispatch = xDispatchProvider->queryDispatch( rURL, sRecipient, nOptions );
             }
             catch ( const RuntimeException& )
             {
@@ -233,7 +233,7 @@ throw( css::uno::RuntimeException, std::exception )
         lDispatcher[i] = this->queryDispatch(
                             lDescriptor[i].FeatureURL,
                             lDescriptor[i].FrameName,
-                            lDescriptor[i].SearchFlags);
+                            lDescriptor[i].SearchFlags );
     }
     return lDispatcher;
 }
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 93acf4b..4621b04 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -77,8 +77,8 @@ ServiceHandler::~ServiceHandler()
                 at the same implementation.
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL&  aURL    ,
-                                                                                     const OUString& /*sTarget*/ ,
-                                                                                           sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException, std::exception )
+                                                                                     const OUString& /*sRecipient*/ ,
+                                                                                           sal_Int32        /*nOptions*/  ) throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
     if (aURL.Complete.startsWith(PROTOCOL_VALUE))
@@ -98,7 +98,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
         lDispatcher[i] = this->queryDispatch(
                             lDescriptor[i].FeatureURL,
                             lDescriptor[i].FrameName,
-                            lDescriptor[i].SearchFlags);
+                            lDescriptor[i].SearchFlags );
     }
     return lDispatcher;
 }
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 945717a..c6a0ab3 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -21,7 +21,7 @@
 
 #include <pattern/frame.hxx>
 #include <framework/framelistanalyzer.hxx>
-#include <targets.h>
+#include <recipients.h>
 #include <services.h>
 #include <general.h>
 #include <isstartmoduledispatch.hxx>
@@ -133,7 +133,7 @@ bool StartModuleDispatcher::implts_isBackingModePossible()
 bool StartModuleDispatcher::implts_establishBackingMode()
 {
     css::uno::Reference< css::frame::XDesktop2> xDesktop       = css::frame::Desktop::create( m_xContext );
-    css::uno::Reference< css::frame::XFrame > xFrame           = xDesktop->findFrame(SPECIALTARGET_BLANK, 0);
+    css::uno::Reference< css::frame::XFrame > xFrame           = xDesktop->findFrame( SPECIAL_BLANK, 0 );
     css::uno::Reference< css::awt::XWindow  > xContainerWindow = xFrame->getContainerWindow();
 
     css::uno::Reference< css::frame::XController > xStartModule = css::frame::StartModule::createWithParentWindow(m_xContext, xContainerWindow);
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 91e058b..0e1141e 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -80,7 +80,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
         lDispatcher[i] = this->queryDispatch(
                             lDescriptor[i].FeatureURL,
                             lDescriptor[i].FrameName,
-                            lDescriptor[i].SearchFlags);
+                            lDescriptor[i].SearchFlags );
     }
     return lDispatcher;
 }
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 71ecaa0..3745750 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <dispatch/windowcommanddispatch.hxx>
-#include <targets.h>
+#include <recipients.h>
 #include <services.h>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -152,7 +152,7 @@ void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand)
         aCommand.Complete = sCommand;
         xParser->parseStrict(aCommand);
 
-        css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, SPECIALTARGET_SELF, 0);
+        css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, SPECIAL_SELF, 0);
         if (xDispatch.is())
             xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >());
     }
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 158429e..9b940ac 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::awt;
 // But don't forget to change values of follow defines, if you do something with this enum!
 enum EPROPERTIES
 {
-    HANDLE_COMMANDURL,
+    HANDLE_ACTIONURL,
     HANDLE_HELPURL,
     HANDLE_IMAGE,
     HANDLE_SUBCONTAINER,
@@ -169,8 +169,8 @@ throw( IllegalArgumentException )
 
     switch( nHandle )
     {
-        case HANDLE_COMMANDURL:
-            bReturn = impl_tryToChangeProperty( m_aCommandURL, aValue, aOldValue, aConvertedValue );
+        case HANDLE_ACTIONURL:
+            bReturn = impl_tryToChangeProperty( m_aActionURL, aValue, aOldValue, aConvertedValue );
             break;
 
         case HANDLE_HELPURL:
@@ -203,8 +203,8 @@ throw( Exception, std::exception )
     // Search for right handle ... and try to set property value.
     switch( nHandle )
     {
-        case HANDLE_COMMANDURL:
-            aValue >>= m_aCommandURL;
+        case HANDLE_ACTIONURL:
+            aValue >>= m_aActionURL;
             break;
 
         case HANDLE_HELPURL:
@@ -233,8 +233,8 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
     // Search for right handle ... and try to get property value.
     switch( nHandle )
     {
-        case HANDLE_COMMANDURL:
-            aValue <<= m_aCommandURL;
+        case HANDLE_ACTIONURL:
+            aValue <<= m_aActionURL;
             break;
 
         case HANDLE_HELPURL:
@@ -282,7 +282,7 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
 Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo()
 throw ( RuntimeException, std::exception )
 {
-    // Optimize this method !
+    // * Optimize this method *
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
     static Reference< XPropertySetInfo >* pInfo = nullptr;
@@ -300,24 +300,23 @@ throw ( RuntimeException, std::exception )
         }
     }
 
-    return (*pInfo);
+    return *pInfo;
 }
 
 const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescriptor()
 {
     const Property pActionTriggerPropertys[] =
     {
-        Property( OUString( "CommandURL"    ), HANDLE_COMMANDURL   , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "HelpURL"       ), HANDLE_HELPURL      , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "Image"         ), HANDLE_IMAGE     , cppu::UnoType<XBitmap>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "SubContainer"  ), HANDLE_SUBCONTAINER , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "Text"          ), HANDLE_TEXT         , cppu::UnoType<XInterface>::get(), PropertyAttribute::TRANSIENT  )
+        Property(  OUString( "ActionURL" ), HANDLE_ACTIONURL, cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
+        Property(  OUString( "HelpURL" ), HANDLE_HELPURL, cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
+        Property(  OUString( "Image" ), HANDLE_IMAGE, cppu::UnoType<XBitmap>::get(), PropertyAttribute::TRANSIENT  ),
+        Property(  OUString( "SubContainer" ), HANDLE_SUBCONTAINER, cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
+        Property(  OUString( "Text" ), HANDLE_TEXT, cppu::UnoType<XInterface>::get(), PropertyAttribute::TRANSIENT  )
     };
 
-    // Use it to initialize sequence!
+    // Use it to initialize sequence
     const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
 
-    // Return "PropertyDescriptor"
     return seqActionTriggerPropertyDescriptor;
 }
 
@@ -331,7 +330,7 @@ throw( IllegalArgumentException )
     // Set default return value if method failed.
     bool bReturn = false;
     // Get new value from any.
-    // IllegalArgumentException() can be thrown!
+    // IllegalArgumentException() can be thrown
     OUString sValue;
     convertPropertyValue( sValue, aNewValue );
 
@@ -346,7 +345,7 @@ throw( IllegalArgumentException )
     }
     else
     {
-        // ... clear information of return parameter!
+        // ... clear information of return parameter
         aOldValue.clear         ();
         aConvertedValue.clear   ();
         // Return NOTHING - "value will not be change ..."
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index ebfcb0a..29f4f19 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -55,10 +55,10 @@ AddonMenu::~AddonMenu()
     disposeOnce();
 }
 
-// Check if command URL string has the unique prefix to identify addon popup menus
-bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL )
+// Check if action URL string has the unique prefix to identify addon popup menus
+bool AddonPopupMenu::IsActionURLPrefix( const OUString& aURL )
 {
-    return aCmdURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR );
+    return aURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR );
 }
 
 AddonPopupMenu::AddonPopupMenu() :
@@ -211,7 +211,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
 
         OUString                              aTitle;
         OUString                              aURL;
-        OUString                              aTarget;
+        OUString                              aRecipient;
         OUString                              aImageId;
         OUString                              aContext;
         Sequence< Sequence< PropertyValue > > aAddonSubMenu;
@@ -224,7 +224,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
             AddonMenuManager::GetMenuEntry( rAddonMenuEntries[i],
                                             aTitle,
                                             aURL,
-                                            aTarget,
+                                            aRecipient,
                                             aImageId,
                                             aContext,
                                             aAddonSubMenu );
@@ -240,7 +240,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
 
                 if ( pAddonPopupMenu->GetItemCount() > 0 )
                 {
-                    pAddonPopupMenu->SetCommandURL( aURL );
+                    pAddonPopupMenu->SetActionURL( aURL );
                     pMergeMenuBar->InsertItem( nId, aTitle, MenuItemBits::NONE, OString(), nInsertPos++ );
                     pMergeMenuBar->SetPopupMenu( nId, pAddonPopupMenu );
 
@@ -272,13 +272,13 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
 
     OUString aTitle;
     OUString aURL;
-    OUString aTarget;
+    OUString aRecipient;
     OUString aImageId;
     OUString aContext;
 
     for ( i = 0; i < nCount; ++i )
     {
-        GetMenuEntry( aAddonMenuDefinition[i], aTitle, aURL, aTarget, aImageId, aContext, aAddonSubMenu );
+        GetMenuEntry( aAddonMenuDefinition[i], aTitle, aURL, aRecipient, aImageId, aContext, aAddonSubMenu );
 
         if ( !IsCorrectContext( rModuleIdentifier, aContext ) || ( aTitle.isEmpty() && aURL.isEmpty() ))
             continue;
@@ -318,8 +318,8 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
             ++nElements;
 
             // Store values from configuration to the New and Wizard menu entries to enable
-            // sfx2 based code to support high contrast mode correctly!
-            sal_uIntPtr nAttributePtr = MenuAttributes::CreateAttribute(aTarget, aImageId);
+            // sfx2 based code to support high contrast mode
+            sal_uIntPtr nAttributePtr = MenuAttributes::CreateAttribute( aRecipient, aImageId );
             pCurrentMenu->SetUserValue(nId, nAttributePtr, MenuAttributes::ReleaseAttribute);
             pCurrentMenu->SetItemCommand( nId, aURL );
 
@@ -333,7 +333,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
 void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenuEntry,
                                      OUString& rTitle,
                                      OUString& rURL,
-                                     OUString& rTarget,
+                                     OUString& rRecipient,
                                      OUString& rImageId,
                                      OUString& rContext,
                                      Sequence< Sequence< PropertyValue > >& rAddonSubMenu )
@@ -348,8 +348,14 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu
             rAddonMenuEntry[i].Value >>= rURL;
         else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TITLE )
             rAddonMenuEntry[i].Value >>= rTitle;
-        else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TARGET )
-            rAddonMenuEntry[i].Value >>= rTarget;
+        else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_RECIPIENT )
+            rAddonMenuEntry[i].Value >>= rRecipient;
+        else if ( aMenuEntryPropName == "Target" )
+        {
+            SAL_WARN( "framework", "\"Target\" into \"Recipient\" in AddonMenuManager" );
+            rAddonMenuEntry[i].Value >>= rRecipient;
+            ///rAddonMenuEntry[i].Name = OUString::createFromAscii( ADDONSMENUITEM_STRING_RECIPIENT );
+        }
         else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_IMAGEIDENTIFIER )
             rAddonMenuEntry[i].Value >>= rImageId;
         else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_SUBMENU )
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index a55292a..40ab7a1 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -52,18 +52,17 @@ using namespace ::com::sun::star;
 
 #define PROPERTYNAME_URL                                ADDONSMENUITEM_STRING_URL
 #define PROPERTYNAME_TITLE                              ADDONSMENUITEM_STRING_TITLE
-#define PROPERTYNAME_TARGET                             ADDONSMENUITEM_STRING_TARGET
+#define PROPERTYNAME_RECIPIENT                          ADDONSMENUITEM_STRING_RECIPIENT
 #define PROPERTYNAME_IMAGEIDENTIFIER                    ADDONSMENUITEM_STRING_IMAGEIDENTIFIER
 #define PROPERTYNAME_CONTEXT                            ADDONSMENUITEM_STRING_CONTEXT
 #define PROPERTYNAME_SUBMENU                            ADDONSMENUITEM_STRING_SUBMENU
 
 #define IMAGES_NODENAME                                 OUString("UserDefinedImages" )
 
-// The following order is mandatory. Please add properties at the end!
 #define INDEX_URL               0
 #define INDEX_TITLE             1
 #define INDEX_IMAGEIDENTIFIER   2
-#define INDEX_TARGET            3
+#define INDEX_RECIPIENT         3
 #define INDEX_CONTEXT           4
 #define INDEX_SUBMENU           5
 #define INDEX_CONTROLTYPE       6
@@ -73,33 +72,29 @@ using namespace ::com::sun::star;
 #define INDEX_OWNERDRAW         10
 #define PROPERTYCOUNT_INDEX     11
 
-// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_MENUITEM                          6
 #define OFFSET_MENUITEM_URL                             0
 #define OFFSET_MENUITEM_TITLE                           1
 #define OFFSET_MENUITEM_IMAGEIDENTIFIER                 2
-#define OFFSET_MENUITEM_TARGET                          3
+#define OFFSET_MENUITEM_RECIPIENT                       3
 #define OFFSET_MENUITEM_CONTEXT                         4
 #define OFFSET_MENUITEM_SUBMENU                         5
 
-// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_POPUPMENU                         4
 #define OFFSET_POPUPMENU_TITLE                          0
 #define OFFSET_POPUPMENU_CONTEXT                        1
 #define OFFSET_POPUPMENU_SUBMENU                        2
 #define OFFSET_POPUPMENU_URL                            3   // Used for property set
 
-// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_TOOLBARITEM                       7
 #define OFFSET_TOOLBARITEM_URL                          0
 #define OFFSET_TOOLBARITEM_TITLE                        1
 #define OFFSET_TOOLBARITEM_IMAGEIDENTIFIER              2
-#define OFFSET_TOOLBARITEM_TARGET                       3
+#define OFFSET_TOOLBARITEM_RECIPIENT                    3
 #define OFFSET_TOOLBARITEM_CONTEXT                      4
 #define OFFSET_TOOLBARITEM_CONTROLTYPE                  5
 #define OFFSET_TOOLBARITEM_WIDTH                        6
 
-// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_STATUSBARITEM                     7
 #define OFFSET_STATUSBARITEM_URL                        0
 #define OFFSET_STATUSBARITEM_TITLE                      1
@@ -109,7 +104,6 @@ using namespace ::com::sun::star;
 #define OFFSET_STATUSBARITEM_OWNERDRAW                  5
 #define OFFSET_STATUSBARITEM_WIDTH                      6
 
-// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_IMAGES                            8
 #define PROPERTYCOUNT_EMBEDDED_IMAGES                   4
 #define OFFSET_IMAGES_SMALL                             0
@@ -146,11 +140,10 @@ using namespace ::com::sun::star;
 #define OFFSET_MERGESTATUSBAR_MERGECONTEXT              4
 #define OFFSET_MERGESTATUSBAR_STATUSBARITEMS            5
 
-//  private declarations!
 
-/*-****************************************************************************************************************
+/*
     @descr  struct to hold information about one menu entry.
-****************************************************************************************************************-*/
+*/
 
 namespace framework
 {
@@ -169,7 +162,7 @@ class AddonsOptions_Impl : public ConfigItem
 
         //  overridden methods of baseclass
 
-        /*-****************************************************************************************************
+        /*
             @short      called for notify of configmanager
             @descr      These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
@@ -178,17 +171,17 @@ class AddonsOptions_Impl : public ConfigItem
             @seealso    baseclass ConfigItem
 
             @param      "lPropertyNames" is the list of properties which should be updated.
-        *//*-*****************************************************************************************************/
+        */
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames ) override;
 
         //  public interface
 
-        /*-****************************************************************************************************
+        /*
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
-        *//*-*****************************************************************************************************/
+        */
 
         bool                                            HasAddonsMenu        () const;
         sal_Int32                                       GetAddonsToolBarCount() const;
@@ -233,13 +226,13 @@ class AddonsOptions_Impl : public ConfigItem
         typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
         typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;
 
-        /*-****************************************************************************************************
-            @short      return list of key names of our configuration management which represent our module tree
+        /*
+            @short      return list of key names of configuration management which represent module tree
             @descr      These methods return the current list of key names! We need it to get needed values from our
                         configuration management!
             @param      "nCount"     ,   returns count of menu entries for "new"
             @return     A list of configuration key names is returned.
-        *//*-*****************************************************************************************************/
+        */
 
         void                 ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
         void                 ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
@@ -256,7 +249,7 @@ class AddonsOptions_Impl : public ConfigItem
         bool                 ReadMergeStatusbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar );
         bool                 ReadMenuItem( const OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu = false );
         bool                 ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
-        void                 AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
+        void                 AppendPopupMenu( Sequence< PropertyValue >& aPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
         bool                 ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
         bool                 ReadStatusBarItem( const OUString& aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem );
         ImageEntry*          ReadImageData( const OUString& aImagesNodeName );
@@ -323,7 +316,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
     // initialize array with fixed property names
     m_aPropNames[ INDEX_URL             ] = PROPERTYNAME_URL;
     m_aPropNames[ INDEX_TITLE           ] = PROPERTYNAME_TITLE;
-    m_aPropNames[ INDEX_TARGET          ] = PROPERTYNAME_TARGET;
+    m_aPropNames[ INDEX_RECIPIENT       ] = PROPERTYNAME_RECIPIENT;
     m_aPropNames[ INDEX_IMAGEIDENTIFIER ] = PROPERTYNAME_IMAGEIDENTIFIER;
     m_aPropNames[ INDEX_CONTEXT         ] = PROPERTYNAME_CONTEXT;
     m_aPropNames[ INDEX_SUBMENU         ] = PROPERTYNAME_SUBMENU; // Submenu set!
@@ -548,10 +541,10 @@ void AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >
     // Init the property value sequence
     aMenuItem[ OFFSET_MENUITEM_URL              ].Name = m_aPropNames[ INDEX_URL            ];
     aMenuItem[ OFFSET_MENUITEM_TITLE            ].Name = m_aPropNames[ INDEX_TITLE          ];
-    aMenuItem[ OFFSET_MENUITEM_TARGET           ].Name = m_aPropNames[ INDEX_TARGET         ];
+    aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Name = m_aPropNames[ INDEX_RECIPIENT      ];
     aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER];
     aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Name = m_aPropNames[ INDEX_CONTEXT        ];
-    aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Name = m_aPropNames[ INDEX_SUBMENU        ];  // Submenu set!
+    aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Name = m_aPropNames[ INDEX_SUBMENU        ];  // Submenu set
 
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
@@ -582,10 +575,10 @@ void AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue >
     // Init the property value sequence
     aMenuItem[ OFFSET_MENUITEM_URL              ].Name = m_aPropNames[ INDEX_URL            ];
     aMenuItem[ OFFSET_MENUITEM_TITLE            ].Name = m_aPropNames[ INDEX_TITLE          ];
-    aMenuItem[ OFFSET_MENUITEM_TARGET           ].Name = m_aPropNames[ INDEX_TARGET         ];
+    aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Name = m_aPropNames[ INDEX_RECIPIENT      ];
     aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER];
     aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Name = m_aPropNames[ INDEX_CONTEXT        ];
-    aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Name = m_aPropNames[ INDEX_SUBMENU        ];  // Submenu set!
+    aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Name = m_aPropNames[ INDEX_SUBMENU        ];  // Submenu set
 
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
@@ -682,7 +675,7 @@ bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNode
     aToolBarItem[ OFFSET_TOOLBARITEM_URL                ].Name = m_aPropNames[ INDEX_URL            ];
     aToolBarItem[ OFFSET_TOOLBARITEM_TITLE              ].Name = m_aPropNames[ INDEX_TITLE          ];
     aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER    ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER];
-    aToolBarItem[ OFFSET_TOOLBARITEM_TARGET             ].Name = m_aPropNames[ INDEX_TARGET         ];
+    aToolBarItem[ OFFSET_TOOLBARITEM_RECIPIENT          ].Name = m_aPropNames[ INDEX_RECIPIENT      ];
     aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT            ].Name = m_aPropNames[ INDEX_CONTEXT        ];
     aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE        ].Name = m_aPropNames[ INDEX_CONTROLTYPE    ];
     aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH              ].Name = m_aPropNames[ INDEX_WIDTH          ];
@@ -1078,7 +1071,7 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
             // A popup menu must have a title and can have a URL and ImageIdentifier
             // Set the other property values to empty
             aMenuItem[ OFFSET_MENUITEM_URL              ].Value <<= aPopupMenuURL;
-            aMenuItem[ OFFSET_MENUITEM_TARGET           ].Value <<= m_aEmpty;
+            aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Value <<= m_aEmpty;
             aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Value <<= aPopupMenuImageId;
             aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ];
 
@@ -1100,7 +1093,7 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
              ReadAndAssociateImages( aStrValue, aMenuImageId );
 
             aMenuItem[ OFFSET_MENUITEM_URL              ].Value <<= aStrValue;
-            aMenuItem[ OFFSET_MENUITEM_TARGET           ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET         ];
+            aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_RECIPIENT      ];
             aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Value <<= aMenuImageId;
             aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT        ];
             aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set!
@@ -1113,7 +1106,7 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
     {
         // Separator
         aMenuItem[ OFFSET_MENUITEM_URL              ].Value <<= aStrValue;
-        aMenuItem[ OFFSET_MENUITEM_TARGET           ].Value <<= m_aEmpty;
+        aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Value <<= m_aEmpty;
         aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Value <<= m_aEmpty;
         aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Value <<= m_aEmpty;
         aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set!
@@ -1161,19 +1154,19 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ
     return bResult;
 }
 
-void AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
+void AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rPopupMenu, const Sequence< PropertyValue >& rOriginPopupMenu )
 {
-    Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq;
-    Sequence< Sequence< PropertyValue > > aSourceSubMenuSeq;
+    Sequence< Sequence< PropertyValue > > aToSubMenuSeq;
+    Sequence< Sequence< PropertyValue > > aFromSubMenuSeq;
 
-    if (( rTargetPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value >>= aTargetSubMenuSeq ) &&
-        ( rSourcePopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value >>= aSourceSubMenuSeq ))
+    if (( rPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value >>= aToSubMenuSeq ) &&
+        ( rOriginPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value >>= aFromSubMenuSeq ))
     {
-        sal_uInt32 nIndex = aTargetSubMenuSeq.getLength();
-        aTargetSubMenuSeq.realloc( nIndex + aSourceSubMenuSeq.getLength() );
-        for ( sal_uInt32 i = 0; i < sal_uInt32( aSourceSubMenuSeq.getLength() ); i++ )
-            aTargetSubMenuSeq[nIndex++] = aSourceSubMenuSeq[i];
-        rTargetPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aTargetSubMenuSeq;
+        sal_uInt32 nIndex = aToSubMenuSeq.getLength();
+        aToSubMenuSeq.realloc( nIndex + aFromSubMenuSeq.getLength() );
+        for ( sal_uInt32 i = 0; i < sal_uInt32( aFromSubMenuSeq.getLength() ); i++ )
+            aToSubMenuSeq[ nIndex++ ] = aFromSubMenuSeq[i];
+        rPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aToSubMenuSeq;
     }
 }
 
@@ -1188,14 +1181,14 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName,
     aToolBarItemNodePropValues = GetProperties( GetPropertyNamesToolBarItem( aAddonToolBarItemTreeNode ) );
 
     // A toolbar item must have a command URL
-    if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_URL ] >>= aURL ) && !aURL.isEmpty() )
+    if ( ( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_URL ] >>= aURL ) && !aURL.isEmpty() )
     {
         if ( aURL == SEPARATOR_URL )
         {
             // A speparator toolbar item only needs a URL
             aToolBarItem[ OFFSET_TOOLBARITEM_URL                ].Value <<= aURL;
             aToolBarItem[ OFFSET_TOOLBARITEM_TITLE              ].Value <<= m_aEmpty;
-            aToolBarItem[ OFFSET_TOOLBARITEM_TARGET             ].Value <<= m_aEmpty;
+            aToolBarItem[ OFFSET_TOOLBARITEM_RECIPIENT          ].Value <<= m_aEmpty;
             aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER    ].Value <<= m_aEmpty;
             aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT            ].Value <<= m_aEmpty;
             aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE        ].Value <<= m_aEmpty;
@@ -1214,7 +1207,7 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName,
 
             aToolBarItem[ OFFSET_TOOLBARITEM_URL                ].Value <<= aURL;
             aToolBarItem[ OFFSET_TOOLBARITEM_TITLE              ].Value <<= aTitle;
-            aToolBarItem[ OFFSET_TOOLBARITEM_TARGET             ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TARGET      ];
+            aToolBarItem[ OFFSET_TOOLBARITEM_RECIPIENT          ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_RECIPIENT   ];
             aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER    ].Value <<= aImageId;
             aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT            ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTEXT     ];
             aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE        ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTROLTYPE ];
@@ -1238,7 +1231,7 @@ void AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen
     // Init the property value sequence
     aMenuItem[ OFFSET_MENUITEM_URL              ].Name = PROPERTYNAME_URL;
     aMenuItem[ OFFSET_MENUITEM_TITLE            ].Name = PROPERTYNAME_TITLE;
-    aMenuItem[ OFFSET_MENUITEM_TARGET           ].Name = PROPERTYNAME_TARGET;
+    aMenuItem[ OFFSET_MENUITEM_RECIPIENT        ].Name = PROPERTYNAME_RECIPIENT;
     aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Name = PROPERTYNAME_IMAGEIDENTIFIER;
     aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Name = PROPERTYNAME_CONTEXT;
     aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Name = PROPERTYNAME_SUBMENU;  // Submenu set!
@@ -1402,7 +1395,7 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
     lResult[OFFSET_MENUITEM_URL]             = aPropertyRootNode + m_aPropNames[ INDEX_URL          ];
     lResult[OFFSET_MENUITEM_TITLE]           = aPropertyRootNode + m_aPropNames[ INDEX_TITLE            ];
     lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ];
-    lResult[OFFSET_MENUITEM_TARGET]          = aPropertyRootNode + m_aPropNames[ INDEX_TARGET           ];
+    lResult[OFFSET_MENUITEM_RECIPIENT]          = aPropertyRootNode + m_aPropNames[ INDEX_RECIPIENT ];
     lResult[OFFSET_MENUITEM_CONTEXT]         = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT      ];
     lResult[OFFSET_MENUITEM_SUBMENU]         = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU      ];
 
@@ -1430,7 +1423,7 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt
     lResult[0] = aPropertyRootNode + m_aPropNames[ INDEX_URL             ];
     lResult[1] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE       ];
     lResult[2] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER];
-    lResult[3] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET          ];
+    lResult[3] = aPropertyRootNode + m_aPropNames[ INDEX_RECIPIENT ];
     lResult[4] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT         ];
     lResult[5] = aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE     ];
     lResult[6] = aPropertyRootNode + m_aPropNames[ INDEX_WIDTH       ];
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index ed9d751..9858bc3 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -19,7 +19,7 @@
 
 #include <framework/framelistanalyzer.hxx>
 
-#include <targets.h>
+#include <recipients.h>
 #include <properties.h>
 #include <services.h>
 
@@ -140,7 +140,7 @@ void FrameListAnalyzer::impl_analyze()
     if (
         ((m_eDetectMode & E_HELP)     == E_HELP                ) &&
         (m_xReferenceFrame.is()                                ) &&
-        (m_xReferenceFrame->getName() == SPECIALTARGET_HELPTASK)
+        (m_xReferenceFrame->getName() == SPECIAL_HELPTASK)
        )
     {
         m_bReferenceIsHelp = true;
@@ -176,8 +176,8 @@ void FrameListAnalyzer::impl_analyze()
             // a) Is it the special help task?
             //    Return it separated from any return list.
             if (
-                ((m_eDetectMode & E_HELP) == E_HELP      ) &&
-                (xFrame->getName()==SPECIALTARGET_HELPTASK)
+                 ((m_eDetectMode & E_HELP) == E_HELP      ) &&
+                 ( xFrame->getName() == SPECIAL_HELPTASK )
                )
             {
                 m_xHelp = xFrame;
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index 4926874..9e38999 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -43,7 +43,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se
     return pOldSetToolBoxControllerCreator;
 }
 
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
+svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aActionURL )
 {
     pfunc_setToolBoxControllerCreator pFactory = nullptr;
     {
@@ -52,7 +52,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram
     }
 
     if ( pFactory )
-        return (*pFactory)( rFrame, pToolbox, nID, aCommandURL );
+        return (*pFactory)( rFrame, pToolbox, nID, aActionURL );
     else
         return nullptr;
 }
@@ -65,7 +65,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun
     return pOldSetStatusBarControllerCreator;
 }
 
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
+svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aActionURL )
 {
     pfunc_setStatusBarControllerCreator pFactory = nullptr;
     {
@@ -74,7 +74,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X
     }
 
     if ( pFactory )
-        return (*pFactory)( rFrame, pStatusBar, nID, aCommandURL );
+        return (*pFactory)( rFrame, pStatusBar, nID, aActionURL );
     else
         return nullptr;
 }
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index e0c3b9e..f7a690f 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short          declaration of special continuation for filter selection
     @descr          Sometimes filter detection during loading document failed. Then we need a possibility
                     to ask user for his decision. These continuation transport selected filter by user to
@@ -44,7 +44,7 @@ namespace framework{
 
     @devstatus      ready to use
     @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
+*/
 class ContinuationFilterSelect : public comphelper::OInteraction< css::document::XInteractionFilterSelect >
 {
     // c++ interface
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 33a171b..d2581b0 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -61,7 +61,7 @@ bool IsSeparator( const Reference< XPropertySet >& xPropertySet )
 
 void GetMenuItemAttributes( const Reference< XPropertySet >& xActionTriggerPropertySet,
                             OUString& aMenuLabel,
-                            OUString& aCommandURL,
+                            OUString& aActionURL,
                             OUString& aHelpURL,
                             Reference< XBitmap >& xBitmap,
                             Reference< XIndexContainer >& xSubContainer )
@@ -70,29 +70,36 @@ void GetMenuItemAttributes( const Reference< XPropertySet >& xActionTriggerPrope
 
     try
     {
-        // mandatory properties
-        a = xActionTriggerPropertySet->getPropertyValue("Text");
+        a = xActionTriggerPropertySet->getPropertyValue( "Text" );
         a >>= aMenuLabel;
-        a = xActionTriggerPropertySet->getPropertyValue("CommandURL");
-        a >>= aCommandURL;
-        a = xActionTriggerPropertySet->getPropertyValue("Image");
+
+        a = xActionTriggerPropertySet->getPropertyValue( "CommandURL" );
+        if ( a.hasValue() )
+        {
+            SAL_WARN( "framework.fwe", "\"CommandURL\" to \"ActionURL\" in GetMenuItemAttributes" );
+            a >>= aActionURL;
+            ///xActionTriggerPropertySet->setPropertyValue( "CommandURL", Any() );
+            //xActionTriggerPropertySet->setPropertyValue( "ActionURL", aActionURL );
+        }
+
+        a = xActionTriggerPropertySet->getPropertyValue( "ActionURL" );
+        a >>= aActionURL;
+
+        a = xActionTriggerPropertySet->getPropertyValue( "Image");
         a >>= xBitmap;
-        a = xActionTriggerPropertySet->getPropertyValue("SubContainer");
+
+        a = xActionTriggerPropertySet->getPropertyValue( "SubContainer" );
         a >>= xSubContainer;
     }
-    catch (const Exception&)
-    {
-    }
+    catch ( const Exception& ) { }
 
     // optional properties
     try
     {
-        a = xActionTriggerPropertySet->getPropertyValue("HelpURL");
+        a = xActionTriggerPropertySet->getPropertyValue( "HelpURL" );
         a >>= aHelpURL;
     }
-    catch (const Exception&)
-    {
-    }
+    catch ( const Exception& ) { }
 }
 
 void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< XIndexContainer >& xActionTriggerContainer )
@@ -119,31 +126,31 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
                     {
                         // Menu item
                         OUString aLabel;
-                        OUString aCommandURL;
+                        OUString aActionURL;
                         OUString aHelpURL;
                         Reference< XBitmap > xBitmap;
                         Reference< XIndexContainer > xSubContainer;
 
                         sal_uInt16 nNewItemId = nItemId++;
-                        GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer );
+                        GetMenuItemAttributes( xPropSet, aLabel, aActionURL, aHelpURL, xBitmap, xSubContainer );
 
                         SolarMutexGuard aGuard;
                         {
                             // insert new menu item
-                            sal_Int32 nIndex = aCommandURL.indexOf( aSlotURL );
+                            sal_Int32 nIndex = aActionURL.indexOf( aSlotURL );
                             if ( nIndex >= 0 )
                             {
                                 // Special code for our menu implementation: some menu items don't have a
                                 // command url but uses the item id as a unqiue identifier. These entries
                                 // got a special url during conversion from menu=>actiontriggercontainer.
                                 // Now we have to extract this special url and set the correct item id!!!
-                                nNewItemId = (sal_uInt16)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
+                                nNewItemId = (sal_uInt16)aActionURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
                                 pSubMenu->InsertItem( nNewItemId, aLabel );
                             }
                             else
                             {
                                 pSubMenu->InsertItem( nNewItemId, aLabel );
-                                pSubMenu->SetItemCommand( nNewItemId, aCommandURL );
+                                pSubMenu->SetItemCommand( nNewItemId, aActionURL );
                             }
 
                             // handle bitmap
@@ -201,7 +208,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
                             else
                             {
                                 // Support add-on images for context menu interceptors
-                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, false, true );
+                                Image aImage = aAddonOptions.GetImageFromURL( aActionURL, false, true );
                                 if ( !!aImage )
                                     pSubMenu->SetItemImage( nNewItemId, aImage );
                             }
@@ -255,15 +262,15 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
             a <<= aLabel;
             xPropSet->setPropertyValue("Text", a );
 
-            OUString aCommandURL = pMenu->GetItemCommand( nItemId );
+            OUString aActionURL = pMenu->GetItemCommand( nItemId );
 
-            if ( aCommandURL.isEmpty() )
+            if ( aActionURL.isEmpty() )
             {
-                aCommandURL = "slot:" + OUString::number( nItemId );
+                aActionURL = "slot:" + OUString::number( nItemId );
             }
 
-            a <<= aCommandURL;
-            xPropSet->setPropertyValue("CommandURL", a );
+            a <<= aActionURL;
+            xPropSet->setPropertyValue( "ActionURL", a );
 
             Image aImage = pMenu->GetItemImage( nItemId );
             if ( !!aImage )
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 8055034..48800d8 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -72,8 +72,8 @@
 #define ATTRIBUTE_ITEMSTYLE_RADIO    "radio"
 
 // Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
+static const char ITEM_DESCRIPTOR_ACTIONURL[] = "ActionURL";
+static const char ITEM_DESCRIPTOR_HELPURL[]    = "HelpURL";
 static const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
 static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
@@ -110,7 +110,7 @@ const MenuStyleItem MenuItemStyles[ ] = {
 sal_Int32 nMenuStyleItemEntries = SAL_N_ELEMENTS(MenuItemStyles);
 
 static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp,
-                                   OUString&                       rCommandURL,
+                                   OUString&                       rActionURL,
                                    OUString&                       rLabel,
                                    OUString&                       rHelpURL,
                                    Reference< XIndexAccess >&      rSubMenu,
@@ -119,10 +119,16 @@ static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp,
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
-        if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
+        if ( rProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL )
         {
-            rProp[i].Value >>= rCommandURL;
-            rCommandURL = rCommandURL.intern();
+            rProp[i].Value >>= rActionURL;
+            rActionURL = rActionURL.intern();
+        }
+        else if ( rProp[i].Name == "CommandURL" )
+        {
+            SAL_WARN( "framework.fwe", "\"CommandURL\" into \"ActionURL\" in ExtractMenuParameters" );
+            rProp[i].Value >>= rActionURL;
+            ///rProp[i].Name = ITEM_DESCRIPTOR_ACTIONURL;
         }
         else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
         {
@@ -156,7 +162,7 @@ ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
     m_aLabel( ITEM_DESCRIPTOR_LABEL ),
     m_aContainer( ITEM_DESCRIPTOR_CONTAINER ),
     m_aHelpURL( ITEM_DESCRIPTOR_HELPURL ),
-    m_aCommandURL( ITEM_DESCRIPTOR_COMMANDURL ),
+    m_aActionURL( ITEM_DESCRIPTOR_ACTIONURL ),
     m_aStyle( ITEM_DESCRIPTOR_STYLE )
 {
 }
@@ -172,7 +178,7 @@ throw( SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
-    const OUString& /*aTarget*/, const OUString& /*aData*/ )
+    const OUString& /*aRecipient*/, const OUString& /*aData*/ )
 throw( SAXException, RuntimeException, std::exception )
 {
 }
@@ -197,10 +203,10 @@ OUString ReadMenuDocumentHandlerBase::getErrorLineString()
 }
 
 void ReadMenuDocumentHandlerBase::initPropertyCommon(
-    Sequence< PropertyValue > &rProps, const OUString &rCommandURL,
+    Sequence< PropertyValue > &rProps, const OUString &rActionURL,
     const OUString &rHelpId, const OUString &rLabel, sal_Int16 nItemStyleBits )
 {
-    rProps[0].Name = m_aCommandURL;
+    rProps[0].Name = m_aActionURL;
     rProps[1].Name = m_aHelpURL;
     rProps[2].Name = m_aContainer;
     rProps[3].Name = m_aLabel;
@@ -208,7 +214,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon(
     rProps[5].Name = m_aType;
 
     // Common values
-    rProps[0].Value <<= rCommandURL.intern();
+    rProps[0].Value <<= rActionURL.intern();
     rProps[1].Value <<= rHelpId;
     rProps[2].Value <<= Reference< XIndexContainer >();
     rProps[3].Value <<= rLabel;
@@ -704,7 +710,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( aName != ELEMENT_MENU )
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += "closing element menu expected!";
+                aErrorMessage += "bottom menu is expected here";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -718,7 +724,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( aName != ELEMENT_MENUITEM )
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += "closing element menuitem expected!";
+                aErrorMessage += "bottom menuitem is expected here";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -727,7 +733,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
             if ( aName != ELEMENT_MENUSEPARATOR )
             {
                 OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += "closing element menuseparator expected!";
+                aErrorMessage += "bottom menuseparator is expected here";
                 throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
             }
         }
@@ -763,7 +769,7 @@ throw ( SAXException, RuntimeException )
 
     m_xWriteDocumentHandler->startDocument();
 
-    // write DOCTYPE line!
+    // write DOCTYPE line
     Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
     if ( m_bIsMenuBar /*FIXME*/ && xExtendedDocHandler.is() )
     {
@@ -809,30 +815,30 @@ throw ( SAXException, RuntimeException )
         aAny = rMenuContainer->getByIndex( nItemPos );
         if ( aAny >>= aProps )
         {
-            OUString    aCommandURL;
+            OUString    aActionURL;
             OUString    aLabel;
             OUString    aHelpURL;
             sal_Int16   nType( css::ui::ItemType::DEFAULT );
             sal_Int16   nItemBits( 0 );
             Reference< XIndexAccess > xSubMenu;
 
-            ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits );
+            ExtractMenuParameters( aProps, aActionURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits );
             if ( xSubMenu.is() )
             {
-                if ( aCommandURL == ADDDIRECT_CMD ||
-                    aCommandURL == AUTOPILOTMENU_CMD )
+                if ( aActionURL == ADDDIRECT_CMD ||
+                    aActionURL == AUTOPILOTMENU_CMD )
                 {
-                    WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
+                    WriteMenuItem( aActionURL, aLabel, aHelpURL, nItemBits );
                     bSeparator = false;
                 }
-                else if ( !aCommandURL.isEmpty() && !AddonPopupMenu::IsCommandURLPrefix( aCommandURL ))
+                else if ( !aActionURL.isEmpty() && !AddonPopupMenu::IsActionURLPrefix( aActionURL ))
                 {
                     ::comphelper::AttributeList* pListMenu = new ::comphelper::AttributeList;
                     Reference< XAttributeList > xListMenu( static_cast<XAttributeList *>(pListMenu) , UNO_QUERY );
 
                     pListMenu->AddAttribute( ATTRIBUTE_NS_ID,
                                             m_aAttributeType,
-                                            aCommandURL );
+                                            aActionURL );
 
                     if ( !aLabel.isEmpty() )
                         pListMenu->AddAttribute( ATTRIBUTE_NS_LABEL,
@@ -859,10 +865,10 @@ throw ( SAXException, RuntimeException )
             {
                 if ( nType == css::ui::ItemType::DEFAULT )
                 {
-                    if ( !aCommandURL.isEmpty() )
+                    if ( !aActionURL.isEmpty() )
                     {
                         bSeparator = false;
-                        WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
+                        WriteMenuItem( aActionURL, aLabel, aHelpURL, nItemBits );
                     }
                 }
                 else if ( !bSeparator )
@@ -876,14 +882,14 @@ throw ( SAXException, RuntimeException )
     }
 }
 
-void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle )
+void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aActionURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
 
     pList->AddAttribute( ATTRIBUTE_NS_ID,
                                 m_aAttributeType,
-                                aCommandURL );
+                                aActionURL );
 
     if ( !aHelpURL.isEmpty() )
     {
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 4e4b1bf..9f41118 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -151,10 +151,10 @@ void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespac
 }
 
 void SAL_CALL SaxNamespaceFilter::processingInstruction(
-    const OUString& aTarget, const OUString& aData)
+    const OUString& aRecipient, const OUString& aData )
     throw(  SAXException, RuntimeException, std::exception )
 {
-    xDocumentHandler->processingInstruction( aTarget, aData );
+    xDocumentHandler->processingInstruction( aRecipient, aData );
 }
 
 void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 16af931..306de6c 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -81,7 +81,7 @@ namespace framework
 {
 
 // Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
+static const char ITEM_DESCRIPTOR_ACTIONURL[]   = "ActionURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
 static const char ITEM_DESCRIPTOR_OFFSET[]      = "Offset";
 static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
@@ -90,7 +90,7 @@ static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
 
 static void ExtractStatusbarItemParameters(
     const Sequence< PropertyValue >& rProp,
-    OUString&                        rCommandURL,
+    OUString&                        rActionURL,
     OUString&                        rHelpURL,
     sal_Int16&                       rOffset,
     sal_Int16&                       rStyle,
@@ -98,10 +98,10 @@ static void ExtractStatusbarItemParameters(
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
-        if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
+        if ( rProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL )
         {
-            rProp[i].Value >>= rCommandURL;
-            rCommandURL = rCommandURL.intern();
+            rProp[i].Value >>= rActionURL;
+            rActionURL = rActionURL.intern();
         }
         else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
         {
@@ -191,7 +191,7 @@ throw(  SAXException, RuntimeException, std::exception )
     if ( m_bStatusBarStartFound )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += "No matching start or end element 'statusbar' found!";
+        aErrorMessage += "there's no boundary `statusbar' exists";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -212,7 +212,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( m_bStatusBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element 'statusbar:statusbar' cannot be embedded into 'statusbar:statusbar'!";
+                    aErrorMessage += "embed statusbar:statusbar into statusbar:statusbar? no way";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -225,23 +225,23 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bStatusBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element 'statusbar:statusbaritem' must be embedded into element 'statusbar:statusbar'!";
+                    aErrorMessage += "statusbar:statusbaritem is not embedded into statusbar:statusbar";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 if ( m_bStatusBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element statusbar:statusbaritem is not a container!";
+                    aErrorMessage += "element statusbar:statusbaritem is not a container";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
-                OUString    aCommandURL;
+                OUString    aActionURL;
                 OUString    aHelpURL;
                 sal_Int16   nItemBits( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
                 sal_Int16   nWidth( 0 );
                 sal_Int16   nOffset( STATUSBAR_OFFSET );
-                bool    bCommandURL( false );
+                bool    bHasActionURL( false );
 
                 m_bStatusBarItemStartFound = true;
                 for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
@@ -253,8 +253,8 @@ throw(  SAXException, RuntimeException, std::exception )
                         {
                             case SB_ATTRIBUTE_URL:
                             {
-                                bCommandURL = true;
-                                aCommandURL = xAttribs->getValueByIndex( n );
+                                aActionURL = xAttribs->getValueByIndex( n );
+                                bHasActionURL = true;
                             }
                             break;
 
@@ -277,7 +277,7 @@ throw(  SAXException, RuntimeException, std::exception )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += "Attribute statusbar:align must have one value of 'left','right' or 'center'!";
+                                    aErrorMessage += "attribute statusbar:align may be either `left', `right' or `center'";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -302,7 +302,7 @@ throw(  SAXException, RuntimeException, std::exception )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!";
+                                    aErrorMessage += "attribute statusbar:style may be either `in', `out' or `flat'";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -317,7 +317,7 @@ throw(  SAXException, RuntimeException, std::exception )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!";
+                                    aErrorMessage += "attribute statusbar:autosize may be either `true' or `false'";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -332,7 +332,7 @@ throw(  SAXException, RuntimeException, std::exception )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += "Attribute statusbar:ownerdraw must have value 'true' or 'false'!";
+                                    aErrorMessage += "attribute statusbar:ownerdraw may be either `true' or `false'";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -362,31 +362,31 @@ throw(  SAXException, RuntimeException, std::exception )
                     }
                 } // for
 
-                if ( !bCommandURL )
+                if ( !bHasActionURL )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Required attribute statusbar:url must have a value!";
+                    aErrorMessage += "no value for statusbar:url";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
-                        else
-                        {
-                            Sequence< PropertyValue > aStatusbarItemProp( 6 );
-                            aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
-                            aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL;
-                            aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET;
-                            aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE;
-                            aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH;
-                            aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE;
-
-                            aStatusbarItemProp[0].Value <<= aCommandURL;
-                            aStatusbarItemProp[1].Value <<= aHelpURL;
-                            aStatusbarItemProp[2].Value <<= nOffset;
-                            aStatusbarItemProp[3].Value <<= nItemBits;
-                            aStatusbarItemProp[4].Value <<= nWidth;
-                            aStatusbarItemProp[5].Value = makeAny( css::ui::ItemType::DEFAULT );
-
-                            m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
-                       }
+                else
+                {
+                    Sequence< PropertyValue > aStatusbarItemProp( 6 );
+                    aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_ACTIONURL;
+                    aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL;
+                    aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET;
+                    aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE;
+                    aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH;
+                    aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE;
+
+                    aStatusbarItemProp[0].Value <<= aActionURL;
+                    aStatusbarItemProp[1].Value <<= aHelpURL;
+                    aStatusbarItemProp[2].Value <<= nOffset;
+                    aStatusbarItemProp[3].Value <<= nItemBits;
+                    aStatusbarItemProp[4].Value <<= nWidth;
+                    aStatusbarItemProp[5].Value = makeAny( css::ui::ItemType::DEFAULT );
+
+                    m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
+               }
             }
             break;
 
@@ -449,7 +449,7 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction(
-    const OUString& /*aTarget*/, const OUString& /*aData*/ )
+    const OUString& /*aRecipient*/, const OUString& /*aData*/ )
 throw(  SAXException, RuntimeException, std::exception )
 {
 }
@@ -534,7 +534,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
         aAny = m_aStatusBarItems->getByIndex( nItemPos );
         if ( aAny >>= aProps )
         {
-            OUString    aCommandURL;
+            OUString    aActionURL;
             OUString    aHelpURL;
             sal_Int16   nStyle( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
             sal_Int16   nWidth( 0 );
@@ -542,14 +542,14 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
 
             ExtractStatusbarItemParameters(
                 aProps,
-                aCommandURL,
+                aActionURL,
                 aHelpURL,
                 nOffset,
                 nStyle,
                 nWidth );
 
-            if ( !aCommandURL.isEmpty() )
-                WriteStatusBarItem( aCommandURL, aHelpURL, nOffset, nStyle, nWidth );
+            if ( !aActionURL.isEmpty() )
+                WriteStatusBarItem( aActionURL, aHelpURL, nOffset, nStyle, nWidth );
         }
     }
 
@@ -562,7 +562,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
 //  protected member functions
 
 void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
-    const OUString& rCommandURL,
+    const OUString& rActionURL,
     const OUString& /*rHelpURL*/,
     sal_Int16            nOffset,
     sal_Int16            nStyle,
@@ -578,7 +578,7 @@ throw ( SAXException, RuntimeException )
     }
 
     // save required attribute (URL)
-    pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rCommandURL );
+    pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rActionURL );
 
     // alignment
     if ( nStyle & ItemStyle::ALIGN_RIGHT )
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index c8c550b..12cf7e1 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -47,7 +47,7 @@ namespace framework
 {
 
 // Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
+static const char ITEM_DESCRIPTOR_ACTIONURL[]   = "ActionURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
 static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
@@ -55,7 +55,7 @@ static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
 static const char ITEM_DESCRIPTOR_VISIBLE[]     = "IsVisible";
 
 static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
-                                      OUString&                        rCommandURL,
+                                      OUString&                        rActionURL,
                                       OUString&                        rLabel,
                                       OUString&                        rHelpURL,
                                       sal_Int16&                       rStyle,
@@ -64,10 +64,17 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
-        if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
+        if ( rProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL )
         {
-            rProp[i].Value >>= rCommandURL;
-            rCommandURL = rCommandURL.intern();
+            rProp[i].Value >>= rActionURL;
+            rActionURL = rActionURL.intern();
+        }
+        else if ( rProp[i].Name == "CommandURL" )
+        {
+            SAL_WARN( "framework.fwe", "\"CommandURL\" to \"ActionURL\" in ExtractToolbarParameters" );
+            rProp[i].Value >>= rActionURL;
+            rActionURL = rActionURL.intern();
+            ///rProp[i].Name = ITEM_DESCRIPTOR_ACTIONURL;
         }
         else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
             rProp[i].Value >>= rHelpURL;
@@ -129,7 +136,7 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
     m_aStyle( ITEM_DESCRIPTOR_STYLE ),
     m_aHelpURL( ITEM_DESCRIPTOR_HELPURL ),
     m_aIsVisible( ITEM_DESCRIPTOR_VISIBLE ),
-    m_aCommandURL( ITEM_DESCRIPTOR_COMMANDURL )
+    m_aActionURL( ITEM_DESCRIPTOR_ACTIONURL )
  {
     OUString aNamespaceToolBar( XMLNS_TOOLBAR );
     OUString aNamespaceXLink( XMLNS_XLINK );
@@ -190,7 +197,7 @@ throw(  SAXException, RuntimeException, std::exception )
     if ( m_bToolBarStartFound )
     {
         OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += "No matching start or end element 'toolbar' found!";
+        aErrorMessage += "No top or bottom toolbar found";
         throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
     }
 }
@@ -211,7 +218,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element 'toolbar:toolbar' cannot be embedded into 'toolbar:toolbar'!";
+                    aErrorMessage += "toolbar:toolbar is embedded into toolbar:toolbar? no way";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
                 else
@@ -259,7 +266,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element 'toolbar:toolbaritem' must be embedded into element 'toolbar:toolbar'!";
+                    aErrorMessage += "toolbar:toolbaritem is supposed to be embedded into toolbar:toolbar";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -269,7 +276,7 @@ throw(  SAXException, RuntimeException, std::exception )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element toolbar:toolbaritem is not a container!";
+                    aErrorMessage += "toolbar:toolbaritem is not a container";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -277,7 +284,7 @@ throw(  SAXException, RuntimeException, std::exception )
 
                 m_bToolBarItemStartFound = true;
                 OUString        aLabel;
-                OUString        aCommandURL;
+                OUString        aActionURL;
                 OUString        aHelpURL;
                 sal_uInt16      nItemBits( 0 );
                 bool            bVisible( true );
@@ -298,7 +305,7 @@ throw(  SAXException, RuntimeException, std::exception )
                             case TB_ATTRIBUTE_URL:
                             {
                                 bAttributeURL   = true;
-                                aCommandURL     = xAttribs->getValueByIndex( n ).intern();
+                                aActionURL     = xAttribs->getValueByIndex( n ).intern();
                             }
                             break;
 
@@ -311,7 +318,7 @@ throw(  SAXException, RuntimeException, std::exception )
                                 else
                                 {
                                     OUString aErrorMessage = getErrorLineString();
-                                    aErrorMessage += "Attribute toolbar:visible must have value 'true' or 'false'!";
+                                    aErrorMessage += "value of attribute toolbar:visible is either `true' or `false'";
                                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                                 }
                             }
@@ -366,14 +373,14 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !bAttributeURL )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Required attribute toolbar:url must have a value!";
+                    aErrorMessage += "where's a value for attribute toolbar:url?";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
-                if ( !aCommandURL.isEmpty() )
+                if ( !aActionURL.isEmpty() )
                 {
                     Sequence< PropertyValue > aToolbarItemProp( 6 );
-                    aToolbarItemProp[0].Name = m_aCommandURL;
+                    aToolbarItemProp[0].Name = m_aActionURL;
                     aToolbarItemProp[1].Name = m_aHelpURL;
                     aToolbarItemProp[2].Name = m_aLabel;
                     aToolbarItemProp[3].Name = m_aType;
@@ -383,21 +390,21 @@ throw(  SAXException, RuntimeException, std::exception )
                     //fix for fdo#39370
                     /// check whether RTL interface or not
                     if(AllSettings::GetLayoutRTL()){
-                        if (aCommandURL == ".uno:ParaLeftToRight")
-                            aCommandURL = ".uno:ParaRightToLeft";
-                        else if (aCommandURL == ".uno:ParaRightToLeft")
-                            aCommandURL = ".uno:ParaLeftToRight";
-                        else if (aCommandURL == ".uno:LeftPara")
-                            aCommandURL = ".uno:RightPara";
-                        else if (aCommandURL == ".uno:RightPara")
-                            aCommandURL = ".uno:LeftPara";
-                        else if (aCommandURL == ".uno:AlignLeft")
-                            aCommandURL = ".uno:AlignRight";
-                        else if (aCommandURL == ".uno:AlignRight")
-                            aCommandURL = ".uno:AlignLeft";
+                        if (aActionURL == ".uno:ParaLeftToRight")
+                            aActionURL = ".uno:ParaRightToLeft";
+                        else if (aActionURL == ".uno:ParaRightToLeft")
+                            aActionURL = ".uno:ParaLeftToRight";
+                        else if (aActionURL == ".uno:LeftPara")
+                            aActionURL = ".uno:RightPara";
+                        else if (aActionURL == ".uno:RightPara")
+                            aActionURL = ".uno:LeftPara";
+                        else if (aActionURL == ".uno:AlignLeft")
+                            aActionURL = ".uno:AlignRight";
+                        else if (aActionURL == ".uno:AlignRight")
+                            aActionURL = ".uno:AlignLeft";
                     }
 
-                    aToolbarItemProp[0].Value <<= aCommandURL;
+                    aToolbarItemProp[0].Value <<= aActionURL;
                     aToolbarItemProp[1].Value <<= aHelpURL;
                     aToolbarItemProp[2].Value <<= aLabel;
                     aToolbarItemProp[3].Value = makeAny( css::ui::ItemType::DEFAULT );
@@ -417,14 +424,14 @@ throw(  SAXException, RuntimeException, std::exception )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element toolbar:toolbarspace is not a container!";
+                    aErrorMessage += "toolbar:toolbarspace is not a container";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 m_bToolBarSpaceStartFound = true;
 
                 Sequence< PropertyValue > aToolbarItemProp( 2 );
-                aToolbarItemProp[0].Name = m_aCommandURL;
+                aToolbarItemProp[0].Name = m_aActionURL;
                 aToolbarItemProp[1].Name = m_aType;
 
                 aToolbarItemProp[0].Value <<= OUString();
@@ -442,14 +449,14 @@ throw(  SAXException, RuntimeException, std::exception )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element toolbar:toolbarbreak is not a container!";
+                    aErrorMessage += "toolbar:toolbarbreak is not a container";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 m_bToolBarBreakStartFound = true;
 
                 Sequence< PropertyValue > aToolbarItemProp( 2 );
-                aToolbarItemProp[0].Name = m_aCommandURL;
+                aToolbarItemProp[0].Name = m_aActionURL;
                 aToolbarItemProp[1].Name = m_aType;
 
                 aToolbarItemProp[0].Value <<= OUString();
@@ -467,14 +474,14 @@ throw(  SAXException, RuntimeException, std::exception )
                      m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "Element toolbar:toolbarseparator is not a container!";
+                    aErrorMessage += "toolbar:toolbarseparator is not a container";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
                 m_bToolBarSeparatorStartFound = true;
 
                 Sequence< PropertyValue > aToolbarItemProp( 2 );
-                aToolbarItemProp[0].Name = m_aCommandURL;
+                aToolbarItemProp[0].Name = m_aActionURL;
                 aToolbarItemProp[1].Name = m_aType;
 
                 aToolbarItemProp[0].Value <<= OUString();
@@ -505,7 +512,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "End element 'toolbar' found, but no start element 'toolbar'";
+                    aErrorMessage += "bottom element `toolbar' found but no top one";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -518,7 +525,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarItemStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'";
+                    aErrorMessage += "bottom element `toolbar:toolbaritem' found but no top one";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -531,7 +538,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarBreakStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'";
+                    aErrorMessage += "bottom element `toolbar:toolbarbreak' found but no top one";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -544,7 +551,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarSpaceStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'";
+                    aErrorMessage += "bottom element `toolbar:toolbarspace' found but no top one";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -557,7 +564,7 @@ throw(  SAXException, RuntimeException, std::exception )
                 if ( !m_bToolBarSeparatorStartFound )
                 {
                     OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'";
+                    aErrorMessage += "bottom element `toolbar:toolbarseparator' found but no top one";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
 
@@ -582,7 +589,7 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction(
-    const OUString& /*aTarget*/, const OUString& /*aData*/ )
+    const OUString& /*aRecipient*/, const OUString& /*aData*/ )
 throw(  SAXException, RuntimeException, std::exception )
 {
 }
@@ -685,16 +692,16 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
         aAny = m_rItemAccess->getByIndex( nItemPos );
         if ( aAny >>= aProps )
         {
-            OUString    aCommandURL;
+            OUString    aActionURL;
             OUString    aLabel;
             OUString    aHelpURL;
             bool    bVisible( true );
             sal_Int16   nType( css::ui::ItemType::DEFAULT );
             sal_Int16   nStyle( 0 );
 
-            ExtractToolbarParameters( aProps, aCommandURL, aLabel, aHelpURL, nStyle, bVisible, nType );
+            ExtractToolbarParameters( aProps, aActionURL, aLabel, aHelpURL, nStyle, bVisible, nType );
             if ( nType == css::ui::ItemType::DEFAULT )
-                WriteToolBoxItem( aCommandURL, aLabel, aHelpURL, nStyle, bVisible );
+                WriteToolBoxItem( aActionURL, aLabel, aHelpURL, nStyle, bVisible );
             else if ( nType == css::ui::ItemType::SEPARATOR_SPACE )
                 WriteToolBoxSpace();
             else if ( nType == css::ui::ItemType::SEPARATOR_LINE )
@@ -713,7 +720,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
 //  protected member functions
 
 void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
-    const OUString& rCommandURL,
+    const OUString& rActionURL,
     const OUString& rLabel,
     const OUString& rHelpURL,
     sal_Int16       nStyle,
@@ -729,7 +736,7 @@ throw ( SAXException, RuntimeException )
     }
 
     // save required attribute (URL)
-    pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rCommandURL );
+    pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rActionURL );
 
     if ( !rLabel.isEmpty() )
     {
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index dc7c3b4..2e851a5 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -202,41 +202,41 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
 {
     // list of all uno implementation names without encoding
     css::uno::Sequence< OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH );
-    sal_Int32 nSourceCount = lNames.getLength();
-    sal_Int32 nTargetCount = nSourceCount;
+    sal_Int32 nOriginCount = lNames.getLength();
+    sal_Int32 nRecipientCount = nOriginCount;
     // list of all full qualified path names of configuration entries
-    css::uno::Sequence< OUString > lFullNames ( nTargetCount );
+    css::uno::Sequence< OUString > lFullNames ( nRecipientCount );
 
     // expand names to full path names
-    sal_Int32 nSource=0;
-    sal_Int32 nTarget=0;
-    for( nSource=0; nSource<nSourceCount; ++nSource )
+    sal_Int32 nOrigin = 0;
+    sal_Int32 nRecipient = 0;
+    for( nOrigin = 0; nOrigin < nOriginCount; ++nOrigin )
     {
         OUStringBuffer sPath( SETNAME_HANDLER );
         sPath.append(CFG_PATH_SEPARATOR);
-        sPath.append(lNames[nSource]);
+        sPath.append( lNames[ nOrigin ] );
         sPath.append(CFG_PATH_SEPARATOR);
         sPath.append(PROPERTY_PROTOCOLS);
 
-        lFullNames[nTarget]  = sPath.makeStringAndClear();
-        ++nTarget;
+        lFullNames[ nRecipient ] = sPath.makeStringAndClear();
+        ++nRecipient;
     }
 
     // get values at all
     css::uno::Sequence< css::uno::Any > lValues = GetProperties( lFullNames );
-    SAL_WARN_IF( lFullNames.getLength()!=lValues.getLength(), "fwk", "HandlerCFGAccess::read(): Miss some configuration values of handler set!" );
+    SAL_WARN_IF( lFullNames.getLength()!=lValues.getLength(), "fwk", "HandlerCFGAccess::read(): Miss some configuration values of handler set" );
 
     // fill structures
-    nSource = 0;
-    for( nTarget=0; nTarget<nTargetCount; ++nTarget )
+    nOrigin = 0;
+    for( nRecipient = 0; nRecipient < nRecipientCount; ++nRecipient )
     {
-        // create it new for every loop to guarantee a real empty object!
+        // create it new for every loop to guarantee a real empty object
         ProtocolHandler aHandler;
-        aHandler.m_sUNOName = ::utl::extractFirstFromConfigurationPath(lNames[nSource]);
+        aHandler.m_sUNOName = ::utl::extractFirstFromConfigurationPath( lNames[ nOrigin ] );
 
         // unpack all values of this handler
         css::uno::Sequence< OUString > lTemp;
-        lValues[nTarget] >>= lTemp;
+        lValues[ nRecipient ] >>= lTemp;
         aHandler.m_lProtocols = Converter::convert_seqOUString2OUStringList(lTemp);
 
         // register his pattern into the performance search hash
@@ -244,12 +244,12 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
                                     pItem!=aHandler.m_lProtocols.end();
                                     ++pItem                             )
         {
-            (**ppPattern)[*pItem] = lNames[nSource];
+            (**ppPattern)[*pItem] = lNames[ nOrigin ];
         }
 
         // insert the handler info into the normal handler cache
-        (**ppHandler)[lNames[nSource]] = aHandler;
-        ++nSource;
+        (**ppHandler)[lNames[ nOrigin ]] = aHandler;
+        ++nOrigin;
     }
 }
 
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index a6d8efc..b15e89d 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -27,10 +27,10 @@
 
 namespace framework{
 
-/*-************************************************************************************************************
+/*
     @short      standard ctor
     @descr      Initialize instance with right start values for correct working.
-*//*-*************************************************************************************************************/
+*/
 TransactionManager::TransactionManager()
     : m_eWorkingMode      ( E_INIT )
     , m_nTransactionCount ( 0      )
@@ -38,14 +38,14 @@ TransactionManager::TransactionManager()
     m_aBarrier.open();
 }
 
-/*-************************************************************************************************************
+/*
     @short      standard dtor
-*//*-*************************************************************************************************************/
+*/
 TransactionManager::~TransactionManager()
 {
 }
 
-/*-****************************************************************************************************
+/*
     @short      set new working mode
     @descr      These implementation knows for states of working: E_INIT, E_WORK, E_BEFORECLOSE, E_CLOSE
                 You can step during this ones only from the left to the right side and start at left side again!
@@ -66,7 +66,7 @@ TransactionManager::~TransactionManager()
                                         It's your decision to react in a right way.
     @param      "eMode", is the new mode - but we don't accept setting mode in wrong order!
     @onerror    We do nothing.
-*//*-*****************************************************************************************************/
+*/
 void  TransactionManager::setWorkingMode( EWorkingMode eMode )
 {
     // Safe member access.
@@ -99,7 +99,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      get current working mode
     @descr      If you stand in your close() or init() method ... but don't know
                 if you called more than ones(!) ... you can use this function to get
@@ -134,7 +134,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
     @return     Current set mode.
 
     @onerror    No error should occur.
-*//*-*****************************************************************************************************/
+*/
 EWorkingMode TransactionManager::getWorkingMode() const
 {
     // Synchronize access to internal member!
@@ -142,7 +142,7 @@ EWorkingMode TransactionManager::getWorkingMode() const
     return m_eWorkingMode;
 }
 
-/*-****************************************************************************************************
+/*
     @short      start new transaction
     @descr      A guard should use this method to start a new transaction. He should looks for rejected
                 calls to by using parameter eMode and eReason.
@@ -152,7 +152,7 @@ EWorkingMode TransactionManager::getWorkingMode() const
     @seealso    method unregisterTransaction()
 
     @param      "eMode"     ,used to enable/disable throwing exceptions automatically for rejected calls
-*//*-*****************************************************************************************************/
+*/
 void  TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException )
 {
     ::osl::MutexGuard aAccessGuard( m_aAccessLock );
@@ -192,12 +192,12 @@ void  TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      finish transaction
     @descr      A guard should call this method to release current transaction.
 
     @seealso    method registerTransaction()
-*//*-*****************************************************************************************************/
+*/
 void  TransactionManager::unregisterTransaction() throw( css::uno::RuntimeException, css::lang::DisposedException )
 {
     // This call could not rejected!
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 6b13cec..907074a 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -20,7 +20,7 @@
 #include <helper/ocomponentaccess.hxx>
 #include <helper/ocomponentenumeration.hxx>
 
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 
 #include <vcl/svapp.hxx>
 
@@ -33,17 +33,12 @@ using namespace ::com::sun::star::uno;
 using namespace ::cppu;
 using namespace ::osl;
 
-//  constructor
-
 OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner )
         :   m_xOwner        ( xOwner                        )
 {
-    // Safe impossible cases
-    SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" );
+    SAL_WARN_IF( !xOwner.is(), "fwk", "OComponentAccess(): met a null xOwner" );
 }
 
-//  destructor
-
 OComponentAccess::~OComponentAccess()
 {
 }
@@ -116,7 +111,7 @@ void OComponentAccess::impl_collectAllChildComponents(  const css::uno::Referenc
         // and go down to next level in tree (recursive!).
 
         const css::uno::Reference< XFrames >                xContainer  = xNode->getFrames();
-        const Sequence< css::uno::Reference< XFrame > > seqFrames   = xContainer->queryFrames( FrameSearchFlag::CHILDREN );
+        const Sequence< css::uno::Reference< XFrame > > seqFrames   = xContainer->queryFrames( FrameSearchOption::Children );
 
         const sal_Int32 nFrameCount = seqFrames.getLength();
         for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame )
@@ -161,23 +156,6 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons
     return xComponent;
 }
 
-//  debug methods
-
-/*-----------------------------------------------------------------------------------------------------------------
-    The follow methods checks the parameter for other functions. If a parameter or his value is non valid,
-    we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT!
-
-    ATTENTION
-
-        If you miss a test for one of this parameters, contact the author or add it himself !(?)
-        But ... look for right testing! See using of this methods!
------------------------------------------------------------------------------------------------------------------*/
-
-bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   css::uno::Reference< XDesktop >&      xOwner  )
-{
-    return xOwner.is();
 }
 
-}       //  namespace framework
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 3759a3a..2a1cc71 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -20,7 +20,7 @@
 #include <helper/oframes.hxx>
 
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 
 #include <vcl/svapp.hxx>
 
@@ -36,22 +36,21 @@ using namespace ::std;
 
 //  constructor
 
-OFrames::OFrames( const   css::uno::Reference< XFrame >&              xOwner          ,
-                            FrameContainer*                     pFrameContainer )
-        :   m_xOwner                    ( xOwner                        )
-        ,   m_pFrameContainer           ( pFrameContainer               )
-        ,   m_bRecursiveSearchProtection( false                     )
+OFrames::OFrames( const css::uno::Reference< XFrame >&  xOwner ,
+                        FrameContainer*            pFrameContainer )
+        :   m_xOwner( xOwner )
+        ,   m_pFrameContainer( pFrameContainer )
+        ,   m_bRecursiveSearchLock( false )
 {
-    // Safe impossible cases
-    // Method is not defined for ALL incoming parameters!
-    SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" );
+    if ( ! xOwner.is() )
+        SAL_WARN( "fwk", "OFrames(): owner is nil" );
+    if ( ! pFrameContainer )
+        SAL_WARN( "fwk", "OFrames(): container is nil" );
 }
 
-//  (proteced!) destructor
-
 OFrames::~OFrames()
 {
-    // Reset instance, free memory ....
+    // Reset instance, free memory
     impl_resetObject();
 }
 
@@ -60,22 +59,22 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
 {
     SolarMutexGuard g;
 
-    // Safe impossible cases
-    // Method is not defined for ALL incoming parameters!
-    SAL_WARN_IF( !impldbg_checkParameter_append( xFrame ), "fwk", "OFrames::append(): Invalid parameter detected!" );
+    SAL_WARN_IF( !xFrame.is(), "fwk", "append(): every frame implements XFrames interface but xFrame parameter is nil" );
 
-    // Do the follow only, if owner instance valid!
-    // Lock owner for follow operations - make a "hard reference"!
+    // Lock owner for follow operations - make a "hard reference"
     css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() )
     {
-        // Append frame to the end of the container ...
+        // Append frame to the end of the container
         m_pFrameContainer->append( xFrame );
         // Set owner of this instance as parent of the new frame in container!
         xFrame->setCreator( xOwner );
     }
-    // Else; Do nothing! Our owner is dead.
-    SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::append():Our owner is dead - you can't append any frames ...!" );
+    else
+    {
+        // owner is absent
+        SAL_WARN( "fwk", "append(): owner is absent and wouldn't append any frames" );
+    }
 }
 
 //  XFrames
@@ -83,9 +82,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
 {
     SolarMutexGuard g;
 
-    // Safe impossible cases
-    // Method is not defined for ALL incoming parameters!
-    SAL_WARN_IF( !impldbg_checkParameter_remove( xFrame ), "fwk", "OFrames::remove(): Invalid parameter detected!" );
+    SAL_WARN_IF( !xFrame.is(), "fwk", "remove(): how are you going to remove nil frame?" );
 
     // Do the follow only, if owner instance valid!
     // Lock owner for follow operations - make a "hard reference"!
@@ -98,46 +95,39 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
         // This must do the caller of this method himself.
         // See documentation of interface XFrames for further information.
     }
-    // Else; Do nothing! Our owner is dead.
-    SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::remove(): Our owner is dead - you can't remove any frames ...!" );
+    else
+    {
+        // owner is quit
+        SAL_WARN( "fwk", "remove(): owner is quit and wouldn't remove any frames" );
+    }
 }
 
 //  XFrames
-Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
+Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchOptions )
+    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    // Safe impossible cases
-    // Method is not defined for ALL incoming parameters!
-    SAL_WARN_IF( !impldbg_checkParameter_queryFrames( nSearchFlags ), "fwk", "OFrames::queryFrames(): Invalid parameter detected!" );
+    if  ( nSearchOptions != ( nSearchOptions & FrameSearchOption::FullMask ) )
+    {
+        SAL_WARN( "fwk", "queryFrames(): I don't know these search options" );
+    }
 
-    // Set default return value. (empty sequence)
+    // default return value is an empty sequence
     Sequence< css::uno::Reference< XFrame > > seqFrames;
 
-    // Do the follow only, if owner instance valid.
-    // Lock owner for follow operations - make a "hard reference"!
+    // creating a "hard reference" locks owner for future operations
     css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
-    if ( xOwner.is() )
+    if ( xOwner.is() ) // do it only if owner instance exists
     {
-        // Work only, if search was not started here ...!
-        if( !m_bRecursiveSearchProtection )
+        // continue only if search was not started here
+        if( !m_bRecursiveSearchLock )
         {
-            // This class is a helper for services, which must implement XFrames.
-            // His parent and children are MY parent and children to.
-            // All searchflags are supported by this implementation!
-            // If some flags should not be supported - don't call me with this flags!!!
-
-            // Search with AUTO-flag is not supported yet!
-            // We think about right implementation.
-            SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" );
-
-            // Search for ALL and GLOBAL is superflous!
-            // We support all necessary flags, from which these two flags are derived.
-            //      ALL     = PARENT + SELF  + CHILDREN + SIBLINGS
-            //      GLOBAL  = ALL    + TASKS
-
-            // Add parent to list ... if any exist!
-            if( nSearchFlags & FrameSearchFlag::PARENT )
+            // This class is a helper for services which implement XFrames
+            // His parent and children are MY parent and children too
+
+            // Add parent to list ... if any exist
+            if( nSearchOptions & FrameSearchOption::Parent )
             {
                 css::uno::Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY );
                 if( xParent.is() )
@@ -148,55 +138,52 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
                 }
             }
 
-            // Add owner to list if SELF is searched.
-            if( nSearchFlags & FrameSearchFlag::SELF )
+            // Add owner to list if Self is searched
+            if( nSearchOptions & FrameSearchOption::Self )
             {
                 Sequence< css::uno::Reference< XFrame > > seqSelf( 1 );
                 seqSelf[0] = xOwner;
                 impl_appendSequence( seqFrames, seqSelf );
             }
 
-            // Add SIBLINGS to list.
-            if( nSearchFlags & FrameSearchFlag::SIBLINGS )
+            // Add Siblings to list
+            if( nSearchOptions & FrameSearchOption::Siblings )
             {
-                // Else; start a new search.
-                // Protect this instance against recursive calls from parents.
-                m_bRecursiveSearchProtection = true;
+                m_bRecursiveSearchLock = true;
+
                 // Ask parent of my owner for frames and append results to return list.
                 css::uno::Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY );
                 // If a parent exist ...
                 if ( xParent.is() )
                 {
-                    // ... ask him for right frames.
-                    impl_appendSequence( seqFrames, xParent->getFrames()->queryFrames( nSearchFlags ) );
+                    // ... ask him for frames
+                    impl_appendSequence( seqFrames, xParent->getFrames()->queryFrames( nSearchOptions ) );
                 }
-                // We have all searched information.
-                // Reset protection-mode.
-                m_bRecursiveSearchProtection = false;
+
+                m_bRecursiveSearchLock = false;
             }
 
-            // If searched for children, step over all elements in container and collect the information.
-            if ( nSearchFlags & FrameSearchFlag::CHILDREN )
+            // If search is for children, step over all elements in container and collect the information
+            if ( nSearchOptions & FrameSearchOption::Children )
             {
-                // Don't search for parents, siblings and self at children!
-                // These things are supported by this instance himself.
-                sal_Int32 nChildSearchFlags = FrameSearchFlag::SELF | FrameSearchFlag::CHILDREN;
+                // Don't search for parents, siblings and self at children
+                // These things are supported by this instance himself
+                sal_Int32 nChildSearchOptions = FrameSearchOption::Self | FrameSearchOption::Children;
                 // Step over all items of container and ask children for frames.
                 sal_uInt32 nCount = m_pFrameContainer->getCount();
                 for ( sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex )
                 {
-                    // We don't must control this conversion.
-                    // We have done this at append()!
                     css::uno::Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY );
-                    impl_appendSequence( seqFrames, xItem->getFrames()->queryFrames( nChildSearchFlags ) );
+                    impl_appendSequence( seqFrames, xItem->getFrames()->queryFrames( nChildSearchOptions ) );
                 }
             }
         }
     }
-    // Else; Do nothing! Our owner is dead.
-    SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::queryFrames(): Our owner is dead - you can't query for frames ...!" );
+    else
+    {
+        SAL_WARN( "fwk", "queryFrames(): owner is nil and wouldn't tell about frames" );
+    }
 
-    // Return result of this operation.
     return seqFrames;
 }
 
@@ -205,19 +192,16 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    // Set default return value.
     sal_Int32 nCount = 0;
 
-    // Do the follow only, if owner instance valid.
-    // Lock owner for follow operations - make a "hard reference"!
+    // Do it only if owner instance exists
     css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() )
     {
-        // Set CURRENT size of container for return.
+        // get size of container for return
         nCount = m_pFrameContainer->getCount();
     }
 
-    // Return result.
     return nCount;
 }
 
@@ -333,66 +317,6 @@ void OFrames::impl_appendSequence(          Sequence< css::uno::Reference< XFram
     seqDestination = seqResult;
 }
 
-//  debug methods
-
-/*-----------------------------------------------------------------------------------------------------------------
-    The follow methods checks the parameter for other functions. If a parameter or his value is non valid,
-    we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT!
-
-    ATTENTION
-
-        If you miss a test for one of this parameters, contact the author or add it himself !(?)
-        But ... look for right testing! See using of this methods!
------------------------------------------------------------------------------------------------------------------*/
-
-// An instance of this class can only work with valid initialization.
-// We share the mutex with our owner class, need a valid factory to instanciate new services and
-// use the access to our owner for some operations.
-bool OFrames::impldbg_checkParameter_OFramesCtor(   const   css::uno::Reference< XFrame >&              xOwner          ,
-                                                            FrameContainer*                             pFrameContainer )
-{
-    return xOwner.is() && pFrameContainer != nullptr;
-}
-
-// Its only allowed to add valid references to container.
-// AND - alle frames must support XFrames-interface!
-bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame )
-{
-    return xFrame.is();
 }
 
-// Its only allowed to add valid references to container...
-// ... => You can only delete valid references!
-bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame )
-{
-    return xFrame.is();
-}
-
-// A search for frames must initiate with right flags.
-// Some one are superflous and not supported yet. But here we control only the range of incoming parameter!
-bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )
-{
-    // Set default return value.
-    bool bOK = true;
-    // Check parameter.
-    if  (
-            (    nSearchFlags != FrameSearchFlag::AUTO        ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::PARENT    ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::SELF      ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::CHILDREN  ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::CREATE    ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::SIBLINGS  ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::TASKS     ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::ALL       ) ) &&
-            ( !( nSearchFlags &  FrameSearchFlag::GLOBAL    ) )
-        )
-    {
-        bOK = false;
-    }
-    // Return result of check.
-    return bOK;
-}
-
-}       //  namespace framework
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 830b5dc..5596d11 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -39,7 +39,7 @@ namespace framework
         <layer>/global/<resourcetype>/<preset>.xml
         <layer>/modules/<moduleid>/<resourcetype>/<preset>.xml
 
-        RESOURCETYPE        PRESET        TARGET
+        RESOURCETYPE        PRESET        RECIPIENT
                             (share)       (user)
         "accelerator"       "default"     "current"
                             "word"
@@ -128,9 +128,9 @@ class PresetHandler
                     working storage of the share layer. */
         std::vector<OUString> m_lPresets;
 
-        /** @short  knows the names of all targets inside the current
+        /** @short  knows the names of all recipients inside the current
                     working storage of the user layer. */
-        std::vector<OUString> m_lTargets;
+        std::vector<OUString> m_lRecipients;
 
         /** @short  it's the current office locale and will be used
                     to handle localized presets.
@@ -168,7 +168,7 @@ class PresetHandler
         /** @short  return access to the internally used and cached root storage.
 
             @descr  These root storages are the base of all further opened
-                    presets and targets. They are provided here only, to support
+                    presets and recipients. They are provided here only, to support
                     older implementations, which base on them ...
 
                     getOrCreate...() - What does it mean?
@@ -185,7 +185,7 @@ class PresetHandler
         /** @short  provides access to the current working storages.
 
             @descr  Working storages are the "lowest" storages, where the
-                    preset and target files exists.
+                    preset and recipient files exists.
 
             @return css::embed::XStorage
                     which the current working storage.
@@ -247,17 +247,17 @@ class PresetHandler
 
         /** @short  try to copy the specified preset from the share
                     layer to the user layer and establish it as the
-                    specified target.
+                    specified recipient.
 
-            @descr  Means: copy share/.../<preset>.xml user/.../<target>.xml
-                    Note: The target will be overwritten completely or
-                    created as new by this operation!
+            @descr  Means: copy share/.../<preset>.xml user/.../<recipient>.xml
+                    Note: The recipient will be overwritten completely or
+                    created as new by this operation
 
             @param  sPreset
                     the ALIAS name of an existing preset.
 
-            @param  sTarget
-                    the ALIAS name of the target.
+            @param  sRecipient
+                    the ALIAS name of the recipient.
 
             @throw  css::container::NoSuchElementException
                     if the specified preset does not exists.
@@ -265,8 +265,8 @@ class PresetHandler
             @throw  css::io::IOException
                     if copying failed.
          */
-        void copyPresetToTarget(const OUString& sPreset,
-                                const OUString& sTarget);
+        void copyPresetToRecipient( const OUString& sPreset,
+                                    const OUString& sRecipient );
 
         /** @short  open the specified preset as stream object
                     and return it.
@@ -283,22 +283,20 @@ class PresetHandler
          */
         css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset);
 
-        /** @short  open the specified target as stream object
+        /** @short  open the specified recipient as stream object
                     and return it.
 
-            @descr  Note: Targets resist inside the user
-                    layer. Normally they are opened in read/write mode.
-                   But it will be opened readonly automatically if that isn't possible
-                    (may be the file is write protected on the system ...).
+            @descr  Note: recipients resist inside the user
+                    layer. Normally they open in read/write mode.
+                   But it will be open readonly automatically if write isn't possible
 
-            @param  sTarget
-                    the ALIAS name of the target.
+            @param  sRecipient
+                    the ALIAS name of the recipient.
 
-            @return The opened target stream ... or NULL if the target does not exists
-                    or couldnt be created as new one.
+            @return The opened stream ... or nil if the recipient does not exists
+                    or couldnt be created.
          */
-        css::uno::Reference< css::io::XStream > openTarget(
-                const OUString& sTarget, sal_Int32 nMode);
+        css::uno::Reference< css::io::XStream > openRecipient( const OUString& sRecipient, sal_Int32 nMode );
 
         /** @short  do anything which is necessary to flush all changes
                     back to disk.
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 9d49e46..10eb5af 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -27,7 +27,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-namespace framework{
+namespace framework {
 
 /** @short      implements a dispatch object which can be used to load
                 non-visible components (by using the mechanism of ContentHandler)
@@ -51,10 +51,10 @@ class LoadDispatcher : public  ::cppu::WeakImplHelper< css::frame::XNotifyingDis
         css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame;
 
         /** @short  TODO document me */
-        OUString m_sTarget;
+        OUString m_sRecipient;
 
         /** @short  TODO document me */
-        sal_Int32 m_nSearchFlags;
+        sal_Int32 m_nSearchOptions;
 
         /** @short  TODO document me */
         LoadEnv m_aLoader;
@@ -66,26 +66,26 @@ class LoadDispatcher : public  ::cppu::WeakImplHelper< css::frame::XNotifyingDis
         /** @short  creates a new instance and initialize it with all necessary parameters.
 
             @descr  Every instance of such LoadDispatcher can be used for the specified context only.
-                    That means: it can be used to load any further requested content into the here(!)
-                    specified target frame.
+                    That means: it can be used to load any further requested content into
+                    the specified recipient frame.
 
             @param  xContext
                     will be used to create own needed services on demand.
 
             @param  xOwnerFrame
-                    used as startpoint to locate the right target frame.
+                    used as startpoint to locate the recipient frame.
 
-            @param  sTargetName
-                    the name or the target frame for loading or a special qualifier
-                    which define such target.
+            @param  sRecipientName
+                    the name or the recipient frame for loading or a special qualifier
+                    which define such recipient.
 
-            @param  nSearchFlags
-                    used in case sTargetFrame isn't a special one.
+            @param  nSearchOptions
+                    used in case recipient isn't a special one.
          */
         LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext,
                        const css::uno::Reference< css::frame::XFrame >&          xOwnerFrame ,
-                       const OUString&                                           sTargetName ,
-                             sal_Int32                                           nSearchFlags);
+                       const OUString&                                           sRecipientName ,
+                             sal_Int32                                           nSearchOptions);
 
         /** @short  used to free internal resources.
          */
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/deliveryhelper.hxx
similarity index 63%
rename from framework/source/inc/loadenv/targethelper.hxx
rename to framework/source/inc/loadenv/deliveryhelper.hxx
index 40c5de1..765a226 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/deliveryhelper.hxx
@@ -17,29 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
-#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_DELIVERYHELPER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_DELIVERYHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <targets.h>
+#include <recipients.h>
 
-namespace framework{
+namespace framework {
 
-/** @short  can be used to detect, if a target name (used e.g. for XFrame.findFrame())
-            has a special meaning or can be used as normal frame name (e.g. for XFrame.setName()).
+/** @short  use to check if a name (used e.g. for XFrame.findFrame()) has a special meaning
+            or not thus can be used as frameâs name (e.g. for XFrame.setName())
 
     @author as96863
  */
-class TargetHelper
+class DeliveryHelper
 {
 
     public:
 
-        /** @short  its used at the following interfaces to classify
-                    target names.
-         */
-        enum ESpecialTarget
+        enum ESpecialRecipient
         {
             E_NOT_SPECIAL   ,
             E_SELF          ,
@@ -55,29 +52,29 @@ class TargetHelper
 
     public:
 
-        /** @short  it checks the given unknown target name,
+        /** @short  it checks the given unknown recipient name
                     if it's the expected special one.
 
-            @note   An empty target is similar to "_self"!
+            @note   An empty name is similar to "_self"
 
-            @param  sCheckTarget
-                    must be the unknown target name, which should be checked.
+            @param  sName
+                    the name to check.
 
-            @param  eSpecialTarget
-                    represent the expected target.
+            @param  eSpecial
+                    represent the expected type.
 
-            @return It returns <TRUE/> if <var>sCheckTarget</var> represent
-                    the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise.
+            @return It returns <TRUE/> if <var>sName</var> represent
+                    the expected <var>eSpecial</var> value; <FALSE/> otherwise.
          */
-        static bool matchSpecialTarget(const OUString& sCheckTarget  ,
-                                                 ESpecialTarget   eSpecialTarget);
+        static bool isSpecialRecipient( const OUString& sName,
+                                              ESpecialRecipient eSpecial );
 
         /** @short  it checks, if the given name can be used
                     to set it at a frame using XFrame.setName() method.
 
-            @descr  Because we handle special targets in a hard coded way
+            @descr  Because we handle special cases in a hard coded way
                     (means we do not check the real name of a frame then)
-                    such named frames will never be found!
+                    such named frames will never be found
 
                     And in case such special names can exists one times only
                     by definition inside the same frame tree (e.g. _beamer and
@@ -86,7 +83,7 @@ class TargetHelper
                     Of course we can't check unknown names, which are not special ones.
                     But we decide, that it's not allowed to use "_" as first sign
                     (because we reserve this letter for our own purposes!)
-                    and the value must not a well known special target.
+                    and the value must not a well known special recipient
 
             @param  sName
                     the new frame name, which should be checked.
@@ -96,6 +93,6 @@ class TargetHelper
 
 } // namespace framework
 
-#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_DELIVERYHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 24ca05f..3fd68e3 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -69,35 +69,35 @@ public:
         E_NO_FEATURE = 0,
         /// enable using of UI elements during loading (means progress, interaction handler etcpp.)
         E_WORK_WITH_UI = 1,
-        /// enable loading of resources, which are not related to a target frame! (see concept of ContentHandler)
+        /// enable loading of resources, which are not related to a frame (see concept of ContentHandler)
         E_ALLOW_CONTENTHANDLER = 2
     };
 
     /** @short  classify a content.
 
-        @descr  The load environment must know, if a content
-                is related to a target frame or not. Only "visible"
+        @descr  The load environment needs to know if a content
+                is related to a recipient frame or not. Only "visible"
                 components, which fulfill the requirements of the
                 model-controller-view paradigm can be loaded into a frame.
                 Such contents are classified as E_CAN_BE_LOADED.
 
                 But e.g. for the dispatch framework exists special ContentHandler
-                objects, which can load a content in "non visible" mode ...
-                and do not need a target frame for its operation. Such
-                ContentHandler e.g. plays sounds.
+                objects, which can load a content in "non visible" mode
+                and do not need a recipient frame for it.
+                Such ContentHandler e.g. plays sounds.
                 Such contents are classified as E_CAN_BE_HANDLED.
 
-                And last but not least a content can be "not valid" in general.
+                And last but not least a content can be not supported.
      */
     enum EContentType
     {
-        /// identifies a content, which seems to be invalid in general
+        /// identifies a content, which seems to be unsupported
         E_UNSUPPORTED_CONTENT,
-        /// identifies a content, which can be used with a ContentHandler and is not related to a target frame
+        /// identifies a content, which can be used with a ContentHandler and is not related to a recipient frame
         E_CAN_BE_HANDLED,
-        /// identifies a content, which can be loaded into a target frame
+        /// identifies a content, which can be loaded into a recipient frame
         E_CAN_BE_LOADED,
-        /// special mode for non real loading, In such case the model is given directly!
+        /// special mode for non real loading, in such case the model is given directly
         E_CAN_BE_SET
     };
 
@@ -110,34 +110,34 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     /** @short  points to the frame, which uses this LoadEnv object
-                and must be used to start target search there.
+                and is used to start recipient search there.
      */
-    css::uno::Reference< css::frame::XFrame > m_xBaseFrame;
+    css::uno::Reference< css::frame::XFrame > m_xOriginFrame;
 
-    /** @short  points to the frame, into which the new component was loaded.
+    /** @short  points to the frame, into which the new component is loaded.
 
         @descr  Note: This reference will be empty if loading failed
-                or a non visible content was loaded!
-                It can be the same frame as m_xBaseFrame it describe, in case
-                the target "_self", "" or the search flag "SELF" was used.
+                or a non visible content is loaded.
+                It can be the same frame as m_xOriginFrame it describe, in case
+                the recipient "_self", "" or the search flag "SELF" was used.
                 Otherwise it's the new created or recycled frame, which was
                 used for loading and contains further the new component.
 
-                Please use method getTarget() or getTargetComponent()
+                Please use method getRecipient() or getReceivingComponent()
                 to return the frame/controller or model to any interested
                 user of the results of this load request.
      */
-    css::uno::Reference< css::frame::XFrame > m_xTargetFrame;
+    css::uno::Reference< css::frame::XFrame > m_xRecipientFrame;
 
-    /** @short  contains the name of the target, in which the specified resource
-                of this instance must be loaded.
+    /** @short  contains the name of the recipient, in which the specified resource
+                of this instance is loaded.
      */
-    OUString m_sTarget;
+    OUString m_sRecipient;
 
-    /** @short  if m_sTarget is not a special one, this flags regulate searching
+    /** @short  if m_sRecipient is not a special one, this flags regulate searching
                 of a suitable one.
      */
-    sal_Int32 m_nSearchFlags;
+    sal_Int32 m_nSearchOptions;
 
     /** @short  contains all needed information about the resource,
                 which should be loaded.
@@ -158,38 +158,38 @@ private:
     /** @short  classify the content, which should be loaded by this instance. */
     EContentType m_eContentType;
 
-    /** @short  it indicates, that the member m_xTargetFrame was new created for this
-                load request and must be closed in case loading (not handling!)
-                operation failed. The default value is sal_False!
+    /** @short  it indicates that the member m_xRecipientFrame is created for this
+                load and will be closed in case loading (not handling) failed.
+                The default value is sal_False
      */
     bool m_bCloseFrameOnError;
 
-    /** @short  it indicates, that the old document (which was located inside m_xBaseFrame
-                in combination with the m_sTarget value "_self") was suspended.
+    /** @short  it indicates that the old document (which was located inside m_xOriginFrame
+                in combination with the m_sRecipient value "_self") was suspended.
                 Normally it will be replaced by the new loaded document. But in case
-                loading (not handling!) failed, it must be reactivated.
-                The default value is sal_False!
+                loading (not handling) failed, it must be reactivated.
+                The default value is sal_False
      */
     bool m_bReactivateControllerOnError;
 
-    /** @short  it holds one (!) asynchronous used contenthandler or frameloader
+    /** @short  it holds single asynchronous used content-handler or frame-loader
                 alive, till the asynchronous operation will be finished.
      */
     css::uno::Reference< css::uno::XInterface > m_xAsynchronousJob;
 
     /** @short  holds the information about the finished load process.
 
-        @descr  The content of m_xTargetFrame can't be used as valid indicator,
+        @descr  The content of m_xRecipientFrame can't be used as valid indicator,
                 (in case the existing old document was reactivated)
-                we must hold the result of the load process explicitly.
+                thus hold the result of the load explicitly.
      */
     bool m_bLoaded;
 
     /** @short      holds an XActionLock on the internal used task member.
 
-        @seealso    m_xTargetFrame
+        @seealso    m_xRecipientFrame
      */
-    ActionLockGuard m_aTargetLock;
+    ActionLockGuard m_aRecipientLock;
 
     rtl::Reference<QuietInteraction> m_pQuietInteraction;
 
@@ -201,7 +201,7 @@ public:
                 reference to an uno service manager, which can be used internally
                 to create on needed services on demand.
 
-        @throw  Currently there is no reason to throw such exception!
+        @throw  Currently there is no reason to throw such exception
 
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
@@ -215,57 +215,57 @@ public:
 
     static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >&    xLoader,
                                                                              const css::uno::Reference< css::uno::XComponentContext >&     xContext,
-                                                                             const OUString&                                        sURL   ,
-                                                                             const OUString&                                        sTarget,
-                                                                                   sal_Int32                                               nFlags ,
+                                                                             const OUString&                                    sURL   ,
+                                                                             const OUString&                                    sRecipient ,
+                                                                                   sal_Int32                                               nOptions ,
                                                                              const css::uno::Sequence< css::beans::PropertyValue >&        lArgs  )
-        throw(css::lang::IllegalArgumentException,
-              css::io::IOException               ,
-              css::uno::RuntimeException         );
+        throw( css::lang::IllegalArgumentException,
+               css::io::IOException,
+               css::uno::RuntimeException );
 
     /** @short  set some changeable parameters for a new load request.
 
-        @descr  The parameter for targeting, the content description, and
+        @descr  The parameter for getting the description of content and
                 some environment specifier (UI, dispatch functionality)
-                can be set here ... BEFORE the real load process is started
+                can be set here ... BEFORE the real loading is started
                 by calling startLoading(). Of course a still running load request
-                will be detected here and a suitable exception will be thrown.
-                Such constellation can be detected outside by using provided
+                is handled here by throwing a suitable exception.
+                Such constellation can be seen outside by using provided
                 synchronisation methods or callbacks.
 
         @param  sURL
-                points to the resource, which should be loaded.
+                points to the resource, which will be loaded.
 
         @param  lMediaDescriptor
                 contains additional information for the following load request.
 
-        @param  xBaseFrame
-                points to the frame which must be used as start point for target search.
+        @param  xOriginFrame
+                points to the frame which must be used as origin for search.
 
-        @param  sTarget
+        @param  sRecipient
                 regulate searching/creating of frames, which should contain the
                 new loaded component afterwards.
 
-        @param  nSearchFlags
-                regulate searching of targets, if sTarget is not a special one.
+        @param  nSearchOptions
+                regulate searching of frames, if sRecipient is not a special one.
 
         @param  eFeature
                 flag field, which enable/disable special features of this
-                new instance for following load call.
+                new instance for following load.
 
         @throw  A LoadEnvException e.g. if another load operation is till in progress
                 or initialization of a new one fail by other reasons.
                 The real reason, a suitable message and ID will be given here immidiatly.
 
-        @throw  A RuntimeException in case any internal process indicates, that
+        @throw  A RuntimeException in case some internal process shows that
                 the whole runtime can't be used any longer.
      */
-    void initializeLoading(const OUString&                                           sURL            ,
-                           const css::uno::Sequence< css::beans::PropertyValue >&    lMediaDescriptor,
-                           const css::uno::Reference< css::frame::XFrame >&          xBaseFrame      ,
-                           const OUString&                                           sTarget         ,
-                                 sal_Int32                                           nSearchFlags    ,
-                                 EFeature                                            eFeature        = E_NO_FEATURE);
+    void initializeLoading( const OUString& sURL,
+                            const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor,
+                            const css::uno::Reference< css::frame::XFrame >& xOriginFrame,
+                            const OUString& sRecipient,
+                                  sal_Int32 nSearchOptions,
+                                  EFeature eFeature = E_NO_FEATURE );
 
     /** @short  start loading of the resource represented by this loadenv instance.
 
@@ -312,13 +312,13 @@ public:
     bool waitWhileLoading(sal_uInt32 nTimeout = 0);
 
     /** TODO document me ... */
-    css::uno::Reference< css::lang::XComponent > getTargetComponent() const;
+    css::uno::Reference< css::lang::XComponent > getReceivingComponent() const;
 
 public:
 
     /** @short      checks if the specified content can be handled by a
-                    ContentHandler only and is not related to a target frame,
-                    or if it can be loaded by a FrameLoader into a target frame
+                    ContentHandler only and is not related to a recipient frame,
+                    or if it can be loaded by a FrameLoader into a recipient frame
                     as "visible" component.
 
         @descr      using:
@@ -329,7 +329,7 @@ public:
                                 break;
 
                             case E_CAN_BE_LOADED :
-                                xFrame = locateTargetFrame();
+                                xFrame = locateRecipientFrame();
                                 loadIt(xFrame);
                                 break;
 
@@ -405,7 +405,7 @@ private:
         @descr  It searches for a suitable content handler object, registered
                 for the detected content type (must be done before by calling
                 impl_detectTypeAndFilter()). Because such handler does not depend
-                from a real target frame, location of such frame will be
+                from a real recipient frame, location of such frame will be
                 suppressed here.
                 In case handle failed all new created resources will be
                 removed before a suitable exception is thrown.
@@ -423,12 +423,12 @@ private:
 
     /** @short  tries to use FrameLoader objects for loading.
 
-        @descr  First the target frame will be located. If it could be found
+        @descr  First the recipient frame will be located. If it could be found
                 or new created a filter/frame loader will be instantiated and
                 used to load the content into this frame.
                 In case loading failed all new created resources will be
                 removed before a suitable exception is thrown.
-                (Excepting a RuntimeException occurrence!)
+                (excepting a RuntimeException occurrence)
 
         @return TODO
 
@@ -442,10 +442,10 @@ private:
 
     /** @short  checks if the specified content is already loaded.
 
-        @descr  It depends from the set target information, if such
+        @descr  It depends on the set of information from recipient, if such
                 search is allowed or not! So this method checks first,
-                if the target is the special one "_default".
-                If not it returns with an empty result immidatly!
+                if the recipient is the special one "_default".
+                If not it returns with an empty result immidatly.
                 In case search is allowed, an existing document with the
                 same URL is searched. If it could be found, the corresponding
                 view will get the focus and this method return the corresponding frame.
@@ -453,7 +453,7 @@ private:
                 view of the document will be updated to show the position
                 inside the document, which is related to the jumpmark.
 
-        @return A valid reference to the target frame, which contains the already loaded content
+        @return A valid reference to the recipient frame, which contains the already loaded content
                 and could be activated successfully. An empty reference oterwhise.
 
         @throw  A LoadEnvException only in cases, where an internal error indicates,
@@ -466,10 +466,10 @@ private:
     css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded()
         throw(LoadEnvException, css::uno::RuntimeException);
 
-    /** @short  search for any target frame, which seems to be useable
+    /** @short  search for any recipient frame, which seems to be useable
                 for this load request.
 
-        @descr  Because this special feature is bound to the target specifier "_default"
+        @descr  Because this special feature is bound to the recipient specifier "_default"
                 its checked inside first. If it's not set => this method return an empty
                 reference. Otherwise any currently existing frame will be analyzed, if
                 it can be used here. The following rules exists:
@@ -479,11 +479,11 @@ private:
                     <li>or contains an empty document of the same application module
                         which the new document will have (Note: the filter of the new content
                         must be well known here!)</li>
-                    <li>and(!) this target must not be already used by any other load request.</li>
+                    <li>and this recipient is not expected to be already used by any other load.</li>
                 </ul>
 
-                If a suitable target is located it will be locked. Thats why the last rule
-                exists! If this method returns a valid frame reference, it was locked to be useable
+                If a suitable recipient is located it will be locked. Thats why the last rule
+                is here. If this method returns a valid frame reference, it was locked to be useable
                 for this load request only. (Don't forget to reset this state later!)
                 Concurrent LoadEnv instances can synchronize her work be using such locks :-) HOPEFULLY
 
@@ -494,7 +494,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget()
+    css::uno::Reference< css::frame::XFrame > impl_searchRecycleRecipient()
         throw(LoadEnvException, css::uno::RuntimeException, std::exception);
 
     /** @short  because showing of a frame is needed more than once...
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index fedf954..754ef55 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -57,8 +57,8 @@ class LoadEnvException
                         global desktop reference! */
             ID_INVALID_ENVIRONMENT,
 
-            /** @short  indicates a failed search for the right target frame. */
-            ID_NO_TARGET_FOUND,
+            /** @short  indicates a failed search for frame */
+            ID_NO_FRAME_FOUND,
 
             /** @short  TODO */
             ID_COULD_NOT_REACTIVATE_CONTROLLER,
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 8acf259..788e993 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -19,7 +19,7 @@
 
 // include own header
 #include <jobs/helponstartup.hxx>
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 #include <services.h>
 
 // include others
@@ -31,7 +31,7 @@
 #include <rtl/ustrbuf.hxx>
 
 // include interfaces
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -223,8 +223,8 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
     if (!xDesktop.is())
         return OUString();
 
-    css::uno::Reference< css::frame::XFrame > xHelp = xDesktop->findFrame(SPECIALTARGET_HELPTASK, css::frame::FrameSearchFlag::CHILDREN);
-    if (!xHelp.is())
+    css::uno::Reference< css::frame::XFrame > xHelp = xDesktop->findFrame( SPECIAL_HELPTASK, css::frame::FrameSearchOption::Children );
+    if ( !xHelp.is() )
         return OUString();
 
     OUString sCurrentHelpURL;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 935c79c..049d8bb 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -471,7 +471,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
 
 /**
     @short  starts listening for office shutdown and closing of our
-            given target frame (if it's a valid reference)
+            given recipient frame (if it's a valid reference)
     @descr  We will register ourself as terminate listener
             at the global desktop instance. That will hold us
             alive and additional we get the information, if the
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index e11c822..4e7f0b0 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -115,8 +115,8 @@ public:
 
     // XDispatchProvider
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL             ,
-                                                                                                         const OUString&                                      sTargetFrameName ,
-                                                                                                               sal_Int32                                             nSearchFlags     ) throw(css::uno::RuntimeException, std::exception) override;
+                                                                                                         const OUString&                                      sRecipientFrameName ,
+                                                                                                               sal_Int32                                             nSearchOptions     ) throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor      ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XNotifyingDispatch
@@ -197,17 +197,17 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
     @param  aURL
                 the queried URL, which should be checked
 
-    @param  sTargetFrameName
-                describes the target frame, in which context this handler will be used
+    @param  sRecipientFrameName
+                describes the recipient frame, in which context this handler will be used
                 Is mostly set to "", "_self", "_blank", "_default" or a non special one
                 using SELF/CREATE as search flags.
 
-    @param  nSearchFlags
-                Can be SELF or CREATE only and are set only if sTargetFrameName isn't a special target
+    @param  nSearchOptions
+                Can be SELF or CREATE only and are set only if sRecipientFrameName isn't a special case
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch( /*IN*/ const css::util::URL&  aURL             ,
-                                                                                  /*IN*/ const OUString& /*sTargetFrameName*/ ,
-                                                                                  /*IN*/       sal_Int32        /*nSearchFlags*/     ) throw(css::uno::RuntimeException, std::exception)
+                                                                                  /*IN*/ const OUString& /*sRecipientFrameName*/ ,
+                                                                                  /*IN*/       sal_Int32        /*nSearchOptions*/     ) throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4424595..14185c5 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1628,9 +1628,9 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
     aWriteLock.clear();
 }
 
-/******************************************************************************
+/*
                         LOOKUP PART FOR TOOLBARS
-******************************************************************************/
+*/
 
 UIElement& ToolbarLayoutManager::impl_findToolbar( const OUString& aName )
 {
@@ -1731,9 +1731,9 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement )
         m_aUIElements.push_back( rUIElement );
 }
 
-/******************************************************************************
+/*
                         LAYOUT CODE PART FOR TOOLBARS
-******************************************************************************/
+*/
 
 awt::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
 {
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/deliveryhelper.cxx
similarity index 50%
rename from framework/source/loadenv/targethelper.cxx
rename to framework/source/loadenv/deliveryhelper.cxx
index 488b052..f6a6c84 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/deliveryhelper.cxx
@@ -17,57 +17,53 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 
-namespace framework{
+namespace framework {
 
-bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget  ,
-                                                ESpecialTarget   eSpecialTarget)
+bool DeliveryHelper::isSpecialRecipient( const OUString& sName ,
+                                               ESpecialRecipient eSpecial )
 {
-    switch(eSpecialTarget)
+    switch( eSpecial )
     {
         case E_SELF :
-            return (
-                    (sCheckTarget.isEmpty()                 ) ||
-                    sCheckTarget == SPECIALTARGET_SELF
-                   );
+            return ( sName.isEmpty() || sName == SPECIAL_SELF );
 
         case E_PARENT :
-            return sCheckTarget == SPECIALTARGET_PARENT;
+            return sName == SPECIAL_PARENT;
 
         case E_TOP :
-            return sCheckTarget == SPECIALTARGET_TOP;
+            return sName == SPECIAL_TOP;
 
         case E_BLANK :
-            return sCheckTarget == SPECIALTARGET_BLANK;
+            return sName == SPECIAL_BLANK;
 
         case E_DEFAULT :
-            return sCheckTarget == SPECIALTARGET_DEFAULT;
+            return sName == SPECIAL_DEFAULT;
 
         case E_BEAMER :
-            return sCheckTarget == SPECIALTARGET_BEAMER;
+            return sName == SPECIAL_BEAMER;
 
         case E_HELPTASK :
-            return sCheckTarget == SPECIALTARGET_HELPTASK;
+            return sName == SPECIAL_HELPTASK;
         default:
             return false;
     }
 }
 
-bool TargetHelper::isValidNameForFrame(const OUString& sName)
+bool DeliveryHelper::isValidNameForFrame( const OUString& sName )
 {
-    // some special targets are really special ones :-)
-    // E.g. the are really used to locate one frame inside the frame tree.
+    // some special recipients are really special ones :-)
+    // e.g. the are really used to locate one frame inside the frame tree
     if (
-        (sName.isEmpty()                                    ) ||
-        (TargetHelper::matchSpecialTarget(sName, E_HELPTASK)) ||
-        (TargetHelper::matchSpecialTarget(sName, E_BEAMER)  )
+         ( sName.isEmpty() ) ||
+         ( DeliveryHelper::isSpecialRecipient(sName, E_HELPTASK) ) ||
+         ( DeliveryHelper::isSpecialRecipient(sName, E_BEAMER) )
        )
         return true;
 
-    // all other names must be checked more general
-    // special targets starts with a "_".
-    return (sName.indexOf('_') != 0);
+    // special cases begin with a "_"
+    return ( sName.indexOf('_') != 0 );
 }
 
 } // namespace framework
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index f5f8e08a..7d383b2 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -19,7 +19,7 @@
 
 #include <loadenv/loadenv.hxx>
 
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 #include <framework/framelistanalyzer.hxx>
 
 #include <interaction/quietinteraction.hxx>
@@ -52,7 +52,7 @@
 #include <com/sun/star/frame/FrameLoaderFactory.hpp>
 #include <com/sun/star/frame/ContentHandlerFactory.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -128,7 +128,7 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis
 LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     throw(LoadEnvException, css::uno::RuntimeException)
     : m_xContext(xContext)
-    , m_nSearchFlags(0)
+    , m_nSearchOptions(0)
     , m_eFeature(E_NO_FEATURE)
     , m_eContentType(E_UNSUPPORTED_CONTENT)
     , m_bCloseFrameOnError(false)
@@ -144,14 +144,14 @@ LoadEnv::~LoadEnv()
 css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader,
                                                                            const css::uno::Reference< css::uno::XComponentContext >& xContext,
                                                                            const OUString& sURL   ,
-                                                                           const OUString& sTarget,
-                                                                                 sal_Int32 nFlags ,
+                                                                           const OUString& sRecipient,
+                                                                                 sal_Int32 nOptions ,
                                                                            const css::uno::Sequence< css::beans::PropertyValue >& lArgs  )
     throw(css::lang::IllegalArgumentException,
           css::io::IOException               ,
           css::uno::RuntimeException         )
 {
-    SAL_WARN( "fwk.loadenv", "LoadEnv::loadComponentFromURL( sURL \"" << sURL << "\", sTarget \"" << sTarget << "\" )" );
+    SAL_WARN( "fwk.loadenv", "LoadEnv::loadComponentFromURL( sURL \"" << sURL << "\", sRecipient \"" << sRecipient << "\" )" );
 
     css::uno::Reference< css::lang::XComponent > xComponent;
 
@@ -162,12 +162,12 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
         aEnv.initializeLoading(sURL,
                                lArgs,
                                css::uno::Reference< css::frame::XFrame >( xLoader, css::uno::UNO_QUERY ),
-                               sTarget,
-                               nFlags);
+                               sRecipient,
+                               nOptions);
         aEnv.startLoading();
         aEnv.waitWhileLoading(); // wait for ever
 
-        xComponent = aEnv.getTargetComponent();
+        xComponent = aEnv.getReceivingComponent();
     }
     catch(const LoadEnvException& ex)
     {
@@ -232,8 +232,8 @@ utl::MediaDescriptor addModelArgs(const uno::Sequence<beans::PropertyValue>& rDe
 }
 
 void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans::PropertyValue>& lMediaDescriptor,
-        const uno::Reference<frame::XFrame>& xBaseFrame, const OUString& sTarget,
-        sal_Int32 nSearchFlags, EFeature eFeature)
+        const uno::Reference<frame::XFrame>& xOriginFrame, const OUString& sRecipient,
+        sal_Int32 nSearchOptions, EFeature eFeature)
 {
     osl::MutexGuard g(m_mutex);
 
@@ -242,11 +242,11 @@ void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans:
         throw LoadEnvException(LoadEnvException::ID_STILL_RUNNING);
 
     // take over all new parameters.
-    m_xTargetFrame.clear();
-    m_xBaseFrame = xBaseFrame;
+    m_xRecipientFrame.clear();
+    m_xOriginFrame = xOriginFrame;
     m_lMediaDescriptor = addModelArgs(lMediaDescriptor);
-    m_sTarget = sTarget;
-    m_nSearchFlags = nSearchFlags;
+    m_sRecipient = sRecipient;
+    m_nSearchOptions = nSearchOptions;
     m_eFeature = eFeature;
     m_eContentType = E_UNSUPPORTED_CONTENT;
     m_bCloseFrameOnError = false;
@@ -434,22 +434,22 @@ bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
     return !m_xAsynchronousJob.is();
 }
 
-css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
+css::uno::Reference< css::lang::XComponent > LoadEnv::getReceivingComponent() const
 {
     osl::MutexGuard g(m_mutex);
 
-    if (!m_xTargetFrame.is())
+    if ( !m_xRecipientFrame.is() )
         return css::uno::Reference< css::lang::XComponent >();
 
-    css::uno::Reference< css::frame::XController > xController = m_xTargetFrame->getController();
-    if (!xController.is())
-        return css::uno::Reference< css::lang::XComponent >(m_xTargetFrame->getComponentWindow(), css::uno::UNO_QUERY);
+    css::uno::Reference< css::frame::XController > xController = m_xRecipientFrame->getController();
+    if ( !xController.is() )
+        return css::uno::Reference< css::lang::XComponent >( m_xRecipientFrame->getComponentWindow(), css::uno::UNO_QUERY );
 
     css::uno::Reference< css::frame::XModel > xModel = xController->getModel();
-    if (!xModel.is())
-        return css::uno::Reference< css::lang::XComponent >(xController, css::uno::UNO_QUERY);
+    if ( !xModel.is() )
+        return css::uno::Reference< css::lang::XComponent >( xController, css::uno::UNO_QUERY );
 
-    return css::uno::Reference< css::lang::XComponent >(xModel, css::uno::UNO_QUERY);
+    return css::uno::Reference< css::lang::XComponent >( xModel, css::uno::UNO_QUERY );
 }
 
 void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
@@ -827,7 +827,7 @@ void LoadEnv::impl_detectTypeAndFilter()
     // check if the filter (if one exists) points to a template format filter.
     // Then we have to add the property "AsTemplate".
     // We need this information to decide afterwards if we can use a "recycle frame"
-    // for target "_default" or has to create a new one every time.
+    // for recipient "_default" or has to create a new one every time.
     // On the other side we have to suppress that, if this property already exists
     // and should trigger a special handling. Then the outside call of this method here,
     // has to know, what he is doing .-)
@@ -839,8 +839,8 @@ void LoadEnv::impl_detectTypeAndFilter()
         try
         {
             ::comphelper::SequenceAsHashMap lFilterProps(xFilterCont->getByName(sFilter));
-            sal_Int32 nFlags         = lFilterProps.getUnpackedValueOrDefault(FILTERPROP_FLAGS, (sal_Int32)0);
-                      bIsOwnTemplate = ((nFlags & FILTERFLAG_TEMPLATEPATH) == FILTERFLAG_TEMPLATEPATH);
+            sal_Int32 nOptions         = lFilterProps.getUnpackedValueOrDefault(FILTERPROP_FLAGS, (sal_Int32)0);
+                      bIsOwnTemplate = ((nOptions & FILTERFLAG_TEMPLATEPATH) == FILTERFLAG_TEMPLATEPATH);
         }
         catch(const css::container::NoSuchElementException&)
             {}
@@ -1003,41 +1003,41 @@ bool LoadEnv::impl_loadContent()
     // SAFE -> -----------------------------------
     osl::ClearableMutexGuard aWriteLock(m_mutex);
 
-    // search or create right target frame
-    OUString sTarget = m_sTarget;
-    if (TargetHelper::matchSpecialTarget(sTarget, TargetHelper::E_DEFAULT))
+    // search or create recipient frame
+    OUString sRecipient = m_sRecipient;
+    if ( DeliveryHelper::isSpecialRecipient(sRecipient, DeliveryHelper::E_DEFAULT) )
     {
-        m_xTargetFrame = impl_searchAlreadyLoaded();
-        if (m_xTargetFrame.is())
+        m_xRecipientFrame = impl_searchAlreadyLoaded();
+        if ( m_xRecipientFrame.is() )
         {
             impl_setResult(true);
             return true;
         }
-        m_xTargetFrame = impl_searchRecycleTarget();
+        m_xRecipientFrame = impl_searchRecycleRecipient();
     }
 
-    if (! m_xTargetFrame.is())
+    if ( ! m_xRecipientFrame.is() )
     {
         if (
-            (TargetHelper::matchSpecialTarget(sTarget, TargetHelper::E_BLANK  )) ||
-            (TargetHelper::matchSpecialTarget(sTarget, TargetHelper::E_DEFAULT))
+            (DeliveryHelper::isSpecialRecipient(sRecipient, DeliveryHelper::E_BLANK  )) ||
+            (DeliveryHelper::isSpecialRecipient(sRecipient, DeliveryHelper::E_DEFAULT))
            )
         {
             if (! impl_furtherDocsAllowed())
                 return false;
-            m_xTargetFrame       = m_xBaseFrame->findFrame(SPECIALTARGET_BLANK, 0);
-            m_bCloseFrameOnError = m_xTargetFrame.is();
+            m_xRecipientFrame = m_xOriginFrame->findFrame( SPECIAL_BLANK, 0 );
+            m_bCloseFrameOnError = m_xRecipientFrame.is();
         }
         else
         {
-            sal_Int32 nFlags = m_nSearchFlags & ~css::frame::FrameSearchFlag::CREATE;
-            m_xTargetFrame   = m_xBaseFrame->findFrame(sTarget, nFlags);
-            if (! m_xTargetFrame.is())
+            sal_Int32 nOptions = m_nSearchOptions & ~css::frame::FrameSearchOption::Create;
+            m_xRecipientFrame = m_xOriginFrame->findFrame( sRecipient, nOptions );
+            if ( ! m_xRecipientFrame.is() )
             {
                 if (! impl_furtherDocsAllowed())
                     return false;
-                m_xTargetFrame       = m_xBaseFrame->findFrame(SPECIALTARGET_BLANK, 0);
-                m_bCloseFrameOnError = m_xTargetFrame.is();
+                m_xRecipientFrame = m_xOriginFrame->findFrame( SPECIAL_BLANK, 0 );
+                m_bCloseFrameOnError = m_xRecipientFrame.is();
             }
         }
     }
@@ -1045,17 +1045,17 @@ bool LoadEnv::impl_loadContent()
     // If we couldn't find a valid frame or the frame has no container window
     // we have to throw an exception.
     if (
-        ( ! m_xTargetFrame.is()                       ) ||
-        ( ! m_xTargetFrame->getContainerWindow().is() )
+         ( ! m_xRecipientFrame.is()                       )  ||
+         ( ! m_xRecipientFrame->getContainerWindow().is() )
        )
-        throw LoadEnvException(LoadEnvException::ID_NO_TARGET_FOUND);
+        throw LoadEnvException( LoadEnvException::ID_NO_FRAME_FOUND );
 
-    css::uno::Reference< css::frame::XFrame > xTargetFrame = m_xTargetFrame;
+    css::uno::Reference< css::frame::XFrame > xRecipientFrame = m_xRecipientFrame;
 
     // Now we have a valid frame ... and type detection was already done.
     // We should apply the module dependent window position and size to the
     // frame window.
-    impl_applyPersistentWindowState(xTargetFrame->getContainerWindow());
+    impl_applyPersistentWindowState( xRecipientFrame->getContainerWindow() );
 
     // Don't forget to lock task for following load process. Otherwise it could die
     // during this operation runs by terminating the office or closing this task via api.
@@ -1067,10 +1067,10 @@ bool LoadEnv::impl_loadContent()
     // if it will be run out of scope.
 
     // Note further: ignore if this internal guard already contains a resource.
-    // Might impl_searchRecylcTarget() set it before. But in case this impl-method wasn't used
-    // and the target frame was new created ... this lock here must be set!
-    css::uno::Reference< css::document::XActionLockable > xTargetLock(xTargetFrame, css::uno::UNO_QUERY);
-    m_aTargetLock.setResource(xTargetLock);
+    // Might impl_searchRecylcRecipient() set it before. But in case this impl-method wasn't used
+    // and the recipient frame is just created ... this lock here is needed
+    css::uno::Reference< css::document::XActionLockable > xRecipientLock( xRecipientFrame, css::uno::UNO_QUERY );
+    m_aRecipientLock.setResource( xRecipientLock );
 
     // Add status indicator to descriptor. Loader can show an progresses then.
     // But don't do it, if loading should be hidden or preview is used ...!
@@ -1084,8 +1084,8 @@ bool LoadEnv::impl_loadContent()
 
     if (!bHidden && !bMinimized && !bPreview && !xProgress.is())
     {
-        // Note: it's an optional interface!
-        css::uno::Reference< css::task::XStatusIndicatorFactory > xProgressFactory(xTargetFrame, css::uno::UNO_QUERY);
+        // Note: it's an optional interface
+        css::uno::Reference< css::task::XStatusIndicatorFactory > xProgressFactory( xRecipientFrame, css::uno::UNO_QUERY );
         if (xProgressFactory.is())
         {
             xProgress = xProgressFactory->createStatusIndicator();
@@ -1112,13 +1112,13 @@ bool LoadEnv::impl_loadContent()
         // <- SAFE -----------------------------------
 
         css::uno::Reference< css::frame::XLoadEventListener > xListener(static_cast< css::frame::XLoadEventListener* >(pListener), css::uno::UNO_QUERY);
-        xAsyncLoader->load(xTargetFrame, sURL, lDescriptor, xListener);
+        xAsyncLoader->load( xRecipientFrame, sURL, lDescriptor, xListener );
 
         return true;
     }
     else if (xSyncLoader.is())
     {
-        bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame);
+        bool bResult = xSyncLoader->load( lDescriptor, xRecipientFrame );
         // react for the result here, so the outside waiting
         // code can ask for it later.
         impl_setResult(bResult);
@@ -1217,7 +1217,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
     css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(xContext));
     xParser->parseStrict(aCmd);
 
-    css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch(aCmd, SPECIALTARGET_SELF, 0);
+    css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aCmd, SPECIAL_SELF, 0 );
     if (! xDispatcher.is())
         return;
 
@@ -1234,7 +1234,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
     // such search is allowed for special requests only ...
     // or better it's not allowed for some requests in general :-)
     if (
-        ( ! TargetHelper::matchSpecialTarget(m_sTarget, TargetHelper::E_DEFAULT)                                               ) ||
+        ( ! DeliveryHelper::isSpecialRecipient(m_sRecipient, DeliveryHelper::E_DEFAULT) ) ||
         m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) ||
 //      (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN()     , false) == sal_True) ||
         m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false)
@@ -1380,7 +1380,7 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::
     return xLock->isActionLocked();
 }
 
-css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
+css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleRecipient()
     throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     // SAFE -> ..................................
@@ -1483,8 +1483,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
     if (impl_isFrameAlreadyUsedForLoading(xTask))
         return css::uno::Reference< css::frame::XFrame >();
 
-    // OK - there is a valid target frame.
-    // But may be it contains already a document.
+    // OK - there is a valid recipient frame.
+    // But it may contain a document already.
     // Then we have to ask it, if it allows recycling of this frame .-)
     bool bReactivateOldControllerOnError = false;
     css::uno::Reference< css::frame::XController > xOldDoc = xTask->getController();
@@ -1499,7 +1499,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
     osl::ClearableMutexGuard aWriteLock(m_mutex);
 
     css::uno::Reference< css::document::XActionLockable > xLock(xTask, css::uno::UNO_QUERY);
-    if (!m_aTargetLock.setResource(xLock))
+    if ( !m_aRecipientLock.setResource( xLock ) )
         return css::uno::Reference< css::frame::XFrame >();
 
     m_bReactivateControllerOnError = bReactivateOldControllerOnError;
@@ -1525,9 +1525,9 @@ void LoadEnv::impl_reactForLoadingState()
         // Bring the new loaded document to front (if allowed!).
         // Note: We show new created frames here only.
         // We don't hide already visible frames here ...
-        css::uno::Reference< css::awt::XWindow > xWindow      = m_xTargetFrame->getContainerWindow();
-        bool                                 bHidden      = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false);
-        bool                                 bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), false);
+        css::uno::Reference< css::awt::XWindow > xWindow = m_xRecipientFrame->getContainerWindow();
+        bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false);
+        bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), false);
 
         if (bMinimized)
         {
@@ -1546,7 +1546,7 @@ void LoadEnv::impl_reactForLoadingState()
 
         // Note: Only if an existing property "FrameName" is given by this media descriptor,
         // it should be used. Otherwise we should do nothing. May be the outside code has already
-        // set a frame name on the target!
+        // set a frame name on the recipient
         utl::MediaDescriptor::const_iterator pFrameName = m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FRAMENAME());
         if (pFrameName != m_lMediaDescriptor.end())
         {
@@ -1554,18 +1554,18 @@ void LoadEnv::impl_reactForLoadingState()
             pFrameName->second >>= sFrameName;
             // Check the name again. e.g. "_default" isn't allowed.
             // On the other side "_beamer" is a valid name :-)
-            if (TargetHelper::isValidNameForFrame(sFrameName))
-                m_xTargetFrame->setName(sFrameName);
+            if ( DeliveryHelper::isValidNameForFrame( sFrameName ) )
+                m_xRecipientFrame->setName( sFrameName );
         }
     }
     else if (m_bReactivateControllerOnError)
     {
-        // Try to reactivate the old document (if any exists!)
-        css::uno::Reference< css::frame::XController > xOldDoc = m_xTargetFrame->getController();
-        // clear does not depend from reactivation state of a might existing old document!
-        // We must make sure, that a might following getTargetComponent() call does not return
-        // the old document!
-        m_xTargetFrame.clear();
+        // Try to reactivate the old document (if any exists)
+        css::uno::Reference< css::frame::XController > xOldDoc = m_xRecipientFrame->getController();
+        // clear does not depend from reactivation state of a might existing old document
+        // make sure that a might following getReceivingComponent() does not return
+        // the old document
+        m_xRecipientFrame.clear();
         if (xOldDoc.is())
         {
             bool bReactivated = xOldDoc->suspend(false);
@@ -1577,8 +1577,8 @@ void LoadEnv::impl_reactForLoadingState()
     else if (m_bCloseFrameOnError)
     {
         // close empty frames
-        css::uno::Reference< css::util::XCloseable > xCloseable (m_xTargetFrame, css::uno::UNO_QUERY);
-        css::uno::Reference< css::lang::XComponent > xDisposable(m_xTargetFrame, css::uno::UNO_QUERY);
+        css::uno::Reference< css::util::XCloseable > xCloseable ( m_xRecipientFrame, css::uno::UNO_QUERY );
+        css::uno::Reference< css::lang::XComponent > xDisposable( m_xRecipientFrame, css::uno::UNO_QUERY );
 
         try
         {
@@ -1592,20 +1592,20 @@ void LoadEnv::impl_reactForLoadingState()
         {}
         catch(const css::lang::DisposedException&)
         {}
-        m_xTargetFrame.clear();
+        m_xRecipientFrame.clear();
     }
 
-    // This max force an implicit closing of our target frame ...
+    // This max force an implicit closing of recipient frame ...
     // e.g. in case close(sal_True) was called before and the frame
     // kill itself if our external use-lock is released here!
     // That's why we release this lock AFTER ALL OPERATIONS on this frame
     // are finished. The frame itself must handle then
     // this situation gracefully.
-    m_aTargetLock.freeResource();
+    m_aRecipientLock.freeResource();
 
     // Last but not least :-)
     // We have to clear the current media descriptor.
-    // Otherwise it hold a might existing stream open!
+    // Otherwise it may hold an existing stream open
     m_lMediaDescriptor.clear();
 
     css::uno::Any aRequest;
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index b4298ed..8f1d583 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -109,19 +109,21 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::
 void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
                                                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
 {
-    OUString aTarget;
+    OUString aRecipient;
 
-    css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, false );
+    css::frame::DispatchStatement aStatement( aURL.Complete, aRecipient, lArguments, 0, false );
     m_aStatements.push_back( aStatement );
 }
 
 void SAL_CALL  DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL,
                                                           const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
 {
-    OUString aTarget;
+    OUString aRecipient;
+
+    // true as last parameter specifies that this statement will be recorded as commented out
+    // see XDispatchRecorder::recordDispatchAsComment()
+    css::frame::DispatchStatement aStatement( aURL.Complete, aRecipient, lArguments, 0, true );
 
-    // last parameter must be set to true -> it's a comment
-    css::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, true );
     m_aStatements.push_back( aStatement );
 }
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 932995f..0922e75 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -21,7 +21,6 @@
 
 #include <loadenv/loadenv.hxx>
 
-#include <loadenv/targethelper.hxx>
 #include <pattern/frame.hxx>
 
 #include <classes/resource.hrc>
@@ -215,8 +214,8 @@ public:
     enum EFailureSafeResult
     {
         E_COPIED,
-        E_ORIGINAL_FILE_MISSING,
-        E_WRONG_TARGET_PATH
+        E_ORIGINAL_FILE_IS_ABSENT,
+        E_RECIPIENT_PATH_DOES_NOT_EXIST
     };
 
     // TODO document me
@@ -902,9 +901,9 @@ private:
     void impl_flushALLConfigChanges();
 
     // TODO document me
-    AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource    ,
-                                                     const OUString& sTargetPath,
-                                                     const OUString& sTargetName);
+    AutoRecovery::EFailureSafeResult implts_copyFile( const OUString& sOrigin,
+                                                      const OUString& sPathOfCopy,
+                                                      const OUString& sNameOfCopy );
 
     /** @short  converts m_eJob into a job description, which
                 can be used to inform an outside listener
@@ -3435,25 +3434,25 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
             )
         {
             // create a frame
-            Reference< XFrame > xTargetFrame = xDesktop->findFrame( SPECIALTARGET_BLANK, 0 );
-            aCleanup.push_back( xTargetFrame.get() );
+            Reference< XFrame > xRecipientFrame = xDesktop->findFrame( "_blank", 0 );
+            aCleanup.push_back( xRecipientFrame.get() );
 
             // create a view to the document
             Reference< XController2 > xController;
             if ( viewName->getLength() )
             {
-                xController.set( xModel->createViewController( *viewName, Sequence< css::beans::PropertyValue >(), xTargetFrame ), UNO_SET_THROW );
+                xController.set( xModel->createViewController( *viewName, Sequence< css::beans::PropertyValue >(), xRecipientFrame ), UNO_SET_THROW );
             }
             else
             {
-                xController.set( xModel->createDefaultViewController( xTargetFrame ), UNO_SET_THROW );
+                xController.set( xModel->createDefaultViewController( xRecipientFrame ), UNO_SET_THROW );
             }
 
             // introduce model/view/controller to each other
             xController->attachModel( xModel.get() );
             xModel->connectController( xController.get() );
-            xTargetFrame->setComponent( xController->getComponentWindow(), xController.get() );
-            xController->attachFrame( xTargetFrame );
+            xRecipientFrame->setComponent( xController->getComponentWindow(), xController.get() );
+            xController->attachFrame( xRecipientFrame );
             xModel->setCurrentController( xController.get() );
         }
 
@@ -3874,7 +3873,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
             continue;
 
         OUString sSourceURL;
-        // Prefer temp file. It contains the changes against the original document!
+        // Prefer temp file. It contains changes since the original document
         if (!rInfo.OldTempURL.isEmpty())
             sSourceURL = rInfo.OldTempURL;
         else if (!rInfo.NewTempURL.isEmpty())
@@ -3886,7 +3885,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
 
         INetURLObject aParser(sSourceURL);
         // AutoRecovery::EFailureSafeResult eResult =
-        implts_copyFile(sSourceURL, aParams.m_sSavePath, aParser.getName());
+        implts_copyFile( sSourceURL, aParams.m_sSavePath, aParser.getName() );
 
         // TODO: Check eResult and react for errors (InteractionHandler!?)
         // Currently we ignore it ...
@@ -3918,25 +3917,25 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
     }
 }
 
-AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource    ,
-                                                               const OUString& sTargetPath,
-                                                               const OUString& sTargetName)
+AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile( const OUString& sOrigin,
+                                                                const OUString& sPathOfCopy,
+                                                                const OUString& sNameOfCopy )
 {
     // create content for the parent folder and call transfer on that content with the source content
     // and the destination file name as parameters
 
     css::uno::Reference< css::ucb::XCommandEnvironment > xEnvironment;
 
-    ::ucbhelper::Content aSourceContent;
-    ::ucbhelper::Content aTargetContent;
+    ::ucbhelper::Content aContentFrom;
+    ::ucbhelper::Content aContentTo;
 
     try
     {
-        aTargetContent = ::ucbhelper::Content(sTargetPath, xEnvironment, m_xContext);
+        aContentTo = ::ucbhelper::Content( sPathOfCopy, xEnvironment, m_xContext );
     }
     catch(const css::uno::Exception&)
     {
-        return AutoRecovery::E_WRONG_TARGET_PATH;
+        return AutoRecovery::E_RECIPIENT_PATH_DOES_NOT_EXIST;
     }
 
     sal_Int32 nNameClash;
@@ -3944,14 +3943,14 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& s
 
     try
     {
-        bool bSuccess = ::ucbhelper::Content::create(sSource, xEnvironment, m_xContext, aSourceContent);
-        if (!bSuccess)
-            return AutoRecovery::E_ORIGINAL_FILE_MISSING;
-        aTargetContent.transferContent(aSourceContent, ::ucbhelper::InsertOperation_COPY, sTargetName, nNameClash);
+        bool bSuccess = ::ucbhelper::Content::create( sOrigin, xEnvironment, m_xContext, aContentFrom );
+        if ( !bSuccess )
+            return AutoRecovery::E_ORIGINAL_FILE_IS_ABSENT;
+        aContentTo.transferContent( aContentFrom, ::ucbhelper::InsertOperation_COPY, sNameOfCopy, nNameClash );
     }
     catch(const css::uno::Exception&)
     {
-        return AutoRecovery::E_ORIGINAL_FILE_MISSING;
+        return AutoRecovery::E_ORIGINAL_FILE_IS_ABSENT;
     }
 
     return AutoRecovery::E_COPIED;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 8d5c842..33d968f 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -20,7 +20,6 @@
 #include <services/desktop.hxx>
 
 #include <loadenv/loadenv.hxx>
-#include <loadenv/targethelper.hxx>
 
 #include <helper/ocomponentaccess.hxx>
 #include <helper/oframes.hxx>
@@ -57,6 +56,7 @@
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/frame/XTerminateListener2.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -132,7 +132,7 @@ void Desktop::constructorInit()
     m_aTransactionManager.setWorkingMode( E_WORK );
 }
 
-/*-************************************************************************************************************
+/*
     @short      standard constructor to create instance by factory
     @descr      This constructor initialize a new instance of this class by valid factory,
                 and will be set valid values on his member and baseclasses.
@@ -150,7 +150,7 @@ void Desktop::constructorInit()
     @param      "xFactory" is the multi service manager, which create this instance.
                 The value must be different from NULL!
     @onerror    We throw an ASSERT in debug version or do nothing in release version.
-*//*-*************************************************************************************************************/
+*/
 Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext )
         :   TransactionBase         (                                               )
         ,   Desktop_BASE            ( m_aMutex )
@@ -178,12 +178,12 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon
 {
 }
 
-/*-************************************************************************************************************
+/*
     @short      standard destructor
     @descr      This one do NOTHING! Use dispose() instaed of this.
 
     @seealso    method dispose()
-*//*-*************************************************************************************************************/
+*/
 Desktop::~Desktop()
 {
     SAL_WARN_IF( !m_bIsTerminated, "fwk", "Desktop not terminated before being destructed" );
@@ -469,7 +469,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
     m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XTerminateListener>::get(), xListener );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDesktop
     @short      get access to create enumerations of all current components
     @descr      You will be the owner of the returned object and must delete it if you don't use it again.
@@ -480,7 +480,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
 
     @onerror    We return a null-reference.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents() throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -494,7 +494,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
     return xAccess;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDesktop
     @short      return the current active component
     @descr      The most current component is the window, model or the controller of the current active frame.
@@ -505,7 +505,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
 
     @onerror    We return a null-reference.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent() throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -526,7 +526,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
     return xComponent;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDesktop
     @short      return the current active frame in hierarchy
     @descr      There can be more than one different active paths in our frame hierarchy. But only one of them
@@ -540,7 +540,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
 
     @onerror    We return a null reference.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -563,25 +563,25 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
     return css::uno::Reference< css::frame::XFrame >( xLast, css::uno::UNO_QUERY );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XComponentLoader
     @short      try to load given URL into a task
-    @descr      You can give us some information about the content, which you will load into a frame.
-                We search or create this target for you, make a type detection of given URL and try to load it.
+    @descr      You can provide some information about the content, which you will load into a frame.
+                We search or create this recipient for you, make a type detection of given URL and try to load it.
                 As result of this operation we return the new created component or nothing, if loading failed.
     @param      "sURL"              , URL, which represent the content
-    @param      "sTargetFrameName"  , name of target frame or special value like "_self", "_blank" ...
-    @param      "nSearchFlags"      , optional arguments for frame search, if target isn't a special one
+    @param      "sName"  , name of recipient frame or special value like "_self", "_blank" ...
+    @param      "nSearchOptions"      , optional arguments for frame search, if recipient isn't a special one
     @param      "lArguments"        , optional arguments for loading
     @return     A valid component reference, if loading was successfully.
                 A null reference otherwise.
 
     @onerror    We return a null reference.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString& sURL            ,
-                                                                                     const OUString& sTargetFrameName,
-                                                                                           sal_Int32 nSearchFlags    ,
+                                                                                     const OUString& sName,
+                                                                                           sal_Int32 nSearchOptions    ,
                                                                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
     throw(  css::io::IOException
           , css::lang::IllegalArgumentException
@@ -590,14 +590,14 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
-    SAL_WARN( "fwk.desktop", "Desktop::loadComponentFromURL( sURL \"" << sURL << "\", sTargetFrameName \"" << sTargetFrameName << "\" )" );
+    SAL_WARN( "fwk.desktop", "Desktop::loadComponentFromURL( sURL \"" << sURL << "\", recipient frame \"" << sName << "\" )" );
 
     css::uno::Reference< css::lang::XComponent > xComponent;
 
     css::uno::Reference< css::frame::XComponentLoader > xThis( static_cast< css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY );
     if ( xThis.is() )
     {
-        xComponent = LoadEnv::loadComponentFromURL( xThis, m_xContext, sURL, sTargetFrameName, nSearchFlags, lArguments );
+        xComponent = LoadEnv::loadComponentFromURL( xThis, m_xContext, sURL, sName, nSearchOptions, lArguments );
     }
     else
     {
@@ -616,7 +616,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
     return xComponent;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XTasksSupplier
     @short      get access to create enumerations of our taskchildren
     @descr      Direct children of desktop are tasks every time.
@@ -634,14 +634,14 @@ But; Don't forget - you will be the owner of returned object and must release it
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception )
 {
     SAL_INFO("fwk", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier");
     return nullptr;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XTasksSupplier
     @short      return current active task of our direct children
     @descr      Desktop children are tasks only ! If we have an active path from desktop
@@ -656,14 +656,14 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception )
 {
     SAL_INFO("fwk", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier");
     return nullptr;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDispatchProvider
     @short      search a dispatcher for given URL
     @descr      We use a helper implementation (class DispatchProvider) to do so.
@@ -673,18 +673,18 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
 
     @seealso    class DispatchProvider
 
-    @param      "aURL"              , URL to dispatch
-    @param      "sTargetFrameName"  , name of target frame, who should dispatch these URL
-    @param      "nSearchFlags"      , flags to regulate the search
-    @param      "lQueries"          , list of queryDispatch() calls!
-    @return     A reference or list of founded dispatch objects for these URL.
+    @param      "aURL"             URL to dispatch
+    @param      "sName"            name of recipient frame who will dispatch this URL
+    @param      "nSearchOptions"   options for the search
+    @param      "lQueries"         list of queryDispatch() calls
+    @return     A reference or list of founded dispatch objects for this URL.
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL&  aURL             ,
-                                                                              const OUString& sTargetFrameName ,
-                                                                                    sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+                                                                              const OUString& sName ,
+                                                                                    sal_Int32        nSearchOptions     ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -706,7 +706,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
     {
         // We use a helper to support these interface and an interceptor mechanism.
         // Our helper is threadsafe by himself!
-        return m_xDispatchHelper->queryDispatch( aURL, sTargetFrameName, nSearchFlags );
+        return m_xDispatchHelper->queryDispatch( aURL, sName, nSearchOptions );
     }
 }
 
@@ -719,7 +719,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
     return m_xDispatchHelper->queryDispatches( lQueries );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDispatchProviderInterception
     @short      supports registration/deregistration of interception objects, which
                 are interested on special dispatches.
@@ -729,7 +729,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
                 the interceptor object, which wish to be (de)registered.
 
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
     throw( css::uno::RuntimeException, std::exception)
 {
@@ -748,7 +748,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
     xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XFramesSupplier
     @short      return access to append or remove children on desktop
     @descr      We don't implement these interface directly. We use a helper class to do this.
@@ -762,7 +762,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -772,7 +772,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
     return m_xFramesHelper;
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XFramesSupplier
     @short      set/get the current active child frame
     @descr      It must be a task. Direct children of desktop are tasks only! No frames are accepted.
@@ -788,7 +788,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -822,7 +822,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
 
 /*
     @interface  XFrame
-    @short      non implemented methods!
+    @short      non implemented method
     @descr      Some method make no sense for our desktop! He has no window or parent or ...
                 So we should implement it empty and warn programmer, if he use it!
 */
@@ -909,7 +909,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
 {
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XFrame
     @short      try to find a frame with special parameters
     @descr      This method searches for a frame with the specified name.
@@ -917,98 +917,93 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
                 be contained in other frames. This hierarchy is searched by
                 this method.
                 First some special names are taken into account, i.e. "",
-                "_self", "_top", "_parent" etc. The FrameSearchFlags are ignored
-                when comparing these names with aTargetFrameName, further steps are
-                controlled by the FrameSearchFlags. If allowed, the name of the frame
-                itself is compared with the desired one, then ( again if allowed )
+                "_self", "_top", "_parent" etc. The search options are ignored
+                when comparing these names with aFrameName, further steps are
+                determined by the search options. If possible, the name of the frame
+                itself is compared with the desired one, then ( again if possible )
                 the method findFrame is called for all children of the frame.
                 If no Frame with the given name is found until the top frames container,
                 a new top Frame is created, if this is allowed by a special
                 FrameSearchFlag. The new Frame also gets the desired name.
                 We use a helper to get right search direction and react in a right manner.
 
-    @seealso    class TargetFinder
-
-    @param      "sTargetFrameName"  , name of searched frame
-    @param      "nSearchFlags"      , flags to regulate search
+    @param      "sFrameName", name of searched frame
+    @param      "nSearchOptions", options to regulate search
     @return     A reference to an existing frame in hierarchy, if it exist.
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
-                                                                             sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+*/
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sFrameName ,
+                                                                             sal_Int32        nSearchOptions     ) throw( css::uno::RuntimeException, std::exception )
 {
-    css::uno::Reference< css::frame::XFrame > xTarget;
+    css::uno::Reference< css::frame::XFrame > xFrame;
 
-    // 0) Ignore wrong parameter!
-    //    We don't support search for following special targets.
-    //    If we reject these requests, we must not check for such names
-    //    in following code again and again. If we do not, so wrong
-    //    search results can occur!
+    // 0) Ignore unexpected parameter
+    //    Don't search for these special recipients.
+    //    With such requests rejected, no need to check for them
+    //    in following code again and again
 
     if (
-        (sTargetFrameName==SPECIALTARGET_DEFAULT  )   ||    // valid for dispatches - not for findFrame()!
-        (sTargetFrameName==SPECIALTARGET_PARENT   )   ||    // we have no parent by definition
-        (sTargetFrameName==SPECIALTARGET_BEAMER   )         // beamer frames are allowed as child of tasks only -
-                                                            // and they exist more than ones. We have no idea which our sub tasks is the right one
+         ( sFrameName == "_default"  )   ||    // it is for dispatches - not for findFrame()
+         ( sFrameName == "_parent"   )   ||    // desktop has no parent by definition
+         ( sFrameName == "_beamer"   )         // beamer frame is a child of tasks only -
+                                                    // no idea which of sub tasks is okay
        )
     {
         return nullptr;
     }
 
-    // I) check for special defined targets first which must be handled exclusive.
-    //    force using of "if() else if() ..."
+    // I) check for special recipients first which are handled exclusively
 
     // I.I) "_blank"
     //  create a new task as child of this desktop instance
     //  Note: Used helper TaskCreator use us automatically ...
 
-    if ( sTargetFrameName==SPECIALTARGET_BLANK )
+    if ( sFrameName == "_blank" )
     {
         TaskCreator aCreator( m_xContext );
-        xTarget = aCreator.createTask(sTargetFrameName);
+        xFrame = aCreator.createTask( sFrameName );
     }
 
     // I.II) "_top"
     //  We are top by definition
 
-    else if ( sTargetFrameName==SPECIALTARGET_TOP )
+    else if ( sFrameName == "_top" )
     {
-        xTarget = this;
+        xFrame = this;
     }
 
     // I.III) "_self", ""
     //  This mean this "frame" in every case.
 
     else if (
-             ( sTargetFrameName==SPECIALTARGET_SELF ) ||
-             ( sTargetFrameName.isEmpty()           )
+              ( sFrameName == "_self" ) ||
+              ( sFrameName.isEmpty() )
             )
     {
-        xTarget = this;
+        xFrame = this;
     }
 
     else
     {
 
-        // II) otherwise use optional given search flags
-        //  force using of combinations of such flags. means no "else" part of use if() statements.
-        //  But we ust break further searches if target was already found.
-        //  Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
-        //  TASK and CREATE are handled special.
-        //  But note: Such flags are not valid for the desktop - especially SIBLINGS or PARENT.
+        // II) otherwise use search options
+        //  just break further searches if recipient is already found
+        //  sequence of using options : SELF - CHILDREN - SIBLINGS - PARENT
+        //  TASK and CREATE are handled specially
+        //  but note that such options are not okay for the desktop - especially SIBLINGS or PARENT
 
         // II.I) SELF
-        //  Check for right name. If it's the searched one return ourself - otherwise
-        //  ignore this flag.
+        //  Check for name. If it's the sought-for one, return ourself - otherwise
+        //  ignore this variant.
 
         if (
-            (nSearchFlags &  css::frame::FrameSearchFlag::SELF)  &&
-            (m_sName == sTargetFrameName)
+             ( nSearchOptions &  css::frame::FrameSearchOption::Self )  &&
+             ( m_sName == sFrameName )
            )
         {
-            xTarget = this;
+            xFrame = this;
         }
 
         // II.II) TASKS
@@ -1020,42 +1015,42 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
         //  Used helper method on our container doesn't create any frame - it's a search only.
 
         if (
-            ( ! xTarget.is()                                  ) &&
-            (nSearchFlags & css::frame::FrameSearchFlag::TASKS)
+            ( ! xFrame.is()                                  ) &&
+            ( nSearchOptions & css::frame::FrameSearchOption::Tasks )
            )
         {
-            xTarget = m_aChildTaskContainer.searchOnDirectChildrens(sTargetFrameName);
+            xFrame = m_aChildTaskContainer.searchOnDirectChildrens( sFrameName );
         }
 
         // II.III) CHILDREN
-        //  Search on all children for the given target name.
+        //  Search on all children for the given recipient name.
         //  An empty name value can't occur here - because it must be already handled as "_self"
         //  before. Used helper function of container doesn't create any frame.
         //  It makes a deep search only.
 
         if (
-            ( ! xTarget.is()                                     ) &&
-            (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN)
+             ( ! xFrame.is()                                     ) &&
+             ( nSearchOptions & css::frame::FrameSearchOption::Children )
            )
         {
-            xTarget = m_aChildTaskContainer.searchOnAllChildrens(sTargetFrameName);
+            xFrame = m_aChildTaskContainer.searchOnAllChildrens( sFrameName );
         }
 
         // II.IV) CREATE
-        //  If we haven't found any valid target frame by using normal flags - but user allowed us to create
-        //  a new one ... we should do that. Used TaskCreator use us automatically as parent!
+        //  If code can't find any recipient frame by using other options but user wants to create
+        //  a new one ... then do that
 
         if (
-            ( ! xTarget.is()                                   )    &&
-            (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
+            ( ! xFrame.is()                                   )    &&
+            ( nSearchOptions & css::frame::FrameSearchOption::Create )
            )
         {
             TaskCreator aCreator( m_xContext );
-            xTarget = aCreator.createTask(sTargetFrameName);
+            xFrame = aCreator.createTask( sFrameName );
         }
     }
 
-    return xTarget;
+    return xFrame;
 }
 
 void SAL_CALL Desktop::disposing()
@@ -1155,19 +1150,19 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang
     m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XDispatchResultListener
     @short      callback for dispatches
     @descr      To support our method "loadComponentFromURL()" we are listener on temp. created dispatcher.
                 They call us back in this method "statusChanged()". As source of given state event, they give us a
-                reference to the target frame, in which dispatch was loaded! So we can use it to return his component
-                to caller! If no target exist ... ??!!
+                reference to the recipient frame, in which dispatch was loaded! So we can use it to return his component
+                to caller! If no recipient exist ... ??!!
 
     @seealso    method loadComponentFromURL()
 
     @param      "aEvent", state event which (hopefully) valid information
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1188,20 +1183,20 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
     }
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XEventListener
     @short      not implemented!
     @descr      We are a status listener ... and so we must be an event listener too ... But we don't need it really!
                 We are a temp. listener only and our lifetime isn't smaller then of our temp. used dispatcher.
 
     @seealso    method loadComponentFromURL()
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
 {
     SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." );
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XInteractionHandler
     @short      callback for loadComponentFromURL for detected exceptions during load process
     @descr      In this case we must cancel loading and throw these detected exception again as result
@@ -1213,14 +1208,14 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un
                 for same operation ... and live with it.
                 b)
                 Search for given continuations too. If any XInteractionAbort exist ... use it to abort further operations
-                for currently running operation!
+                for currently running operation
 
     @seealso    method loadComponentFromURL()
     @seealso    member m_eLoadState
 
-    @param      "xRequest", request for interaction - normal a wrapped target exception from bottom services
+    @param      "xRequest", request for interaction
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1320,7 +1315,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
     return m_xTitleNumberGenerator->getUntitledPrefix ();
 }
 
-/*-************************************************************************************************************
+/*
     @short      try to convert a property value
     @descr      This method is called from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1343,7 +1338,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
 
     @onerror    IllegalArgumentException, if you call this with an invalid argument
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aConvertedValue ,
                                                            css::uno::Any&   aOldValue       ,
                                                            sal_Int32        nHandle         ,
@@ -1386,7 +1381,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     return bReturn;
 }
 
-/*-************************************************************************************************************
+/*
     @short      set value of a transient property
     @descr      This method is calling from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1399,7 +1394,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     @param      "aValue"    new value of property
     @onerror    An exception is thrown.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast(       sal_Int32        nHandle ,
                                                          const css::uno::Any&   aValue  ) throw( css::uno::Exception, std::exception )
 {
@@ -1418,7 +1413,7 @@ void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast(       sal_Int32
     }
 }
 
-/*-************************************************************************************************************
+/*
     @short      get value of a transient property
     @descr      This method is calling from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1430,7 +1425,7 @@ void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast(       sal_Int32
     @param      "nHandle"   handle of property to change
     @param      "aValue"    current value of property
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
                                              sal_Int32      nHandle ) const
 {
@@ -1483,7 +1478,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
     return Static::get();
 }
 
-/*-************************************************************************************************************
+/*
     @short      return propertysetinfo
     @descr      You can call this method to get information about transient properties
                 of this object.
@@ -1497,7 +1492,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
     @seealso    interface XMultiPropertySet
     @return     reference to object with information [XPropertySetInfo]
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1527,7 +1522,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert
     return (*pInfo);
 }
 
-/*-************************************************************************************************************
+/*
     @short      return current component of current frame
     @descr      The desktop himself has no component. But every frame in subtree.
                 If somewhere call getCurrentComponent() at this class, we try to find the right frame and
@@ -1544,7 +1539,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert
 
     @onerror    A null reference is returned.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::lang::XComponent > Desktop::impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 7331177..3bf7a3f 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -61,11 +61,11 @@ DispatchHelper::~DispatchHelper()
     @param sURL
                 describes the requested feature.
 
-    @param sTargetFrameName
+    @param sRecipientFrameName
                 points to the frame, which must be used (or may be created) for this dispatch.
 
-    @param nSearchFlags
-                in case the <var>sTargetFrameName</var> isn't unique, these flags regulate further searches.
+    @param nSearchOptions
+                in case the <var>sRecipientFrameName</var> isn't unique, these flags regulate further searches.
 
     @param lArguments
                 optional arguments for this request.
@@ -75,8 +75,8 @@ DispatchHelper::~DispatchHelper()
 css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
                                 const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
                                 const OUString&                                      sURL              ,
-                                const OUString&                                      sTargetFrameName  ,
-                                      sal_Int32                                             nSearchFlags      ,
+                                const OUString&                                      sRecipientFrameName  ,
+                                      sal_Int32                                             nSearchOptions      ,
                                 const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -102,7 +102,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
     xParser->parseStrict(aURL);
 
     // search dispatcher
-    css::uno::Reference< css::frame::XDispatch >          xDispatch       = xDispatchProvider->queryDispatch(aURL, sTargetFrameName, nSearchFlags);
+    css::uno::Reference< css::frame::XDispatch >          xDispatch       = xDispatchProvider->queryDispatch(aURL, sRecipientFrameName, nSearchOptions);
 
     return executeDispatch(xDispatch, aURL, true, lArguments);
 }
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 29aefb6..d1c70dd 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -30,7 +30,7 @@
 #include <framework/titlehelper.hxx>
 #include <svtools/openfiledroptargetlistener.hxx>
 #include <classes/taskcreator.hxx>
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 #include <framework/framelistanalyzer.hxx>
 #include <helper/dockingareadefaultacceptor.hxx>
 #include <dispatch/dispatchinformationprovider.hxx>
@@ -55,7 +55,7 @@
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/LayoutManager.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchOption.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/task/StatusIndicatorFactory.hpp>
 #include <com/sun/star/task/theJobExecutor.hpp>
@@ -100,12 +100,12 @@ enum EActiveState
     E_FOCUS             // I have the focus now. I must a member of an active path!
 };
 
-/*-************************************************************************************************************
+/*
     @short      implements a normal frame of hierarchy
     @descr      An instance of these class can be a normal node in frame tree. A frame support influencing of his
                 subtree, find of subframes, activate- and deactivate-mechanism as well as
                 set/get of a frame window, component or controller.
-*//*-*************************************************************************************************************/
+*/
 class Frame:
     private cppu::BaseMutex,
     public cppu::PartialWeakComponentImplHelper<
@@ -146,8 +146,8 @@ public:
 
     virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL(
             const OUString& sURL,
-            const OUString& sTargetFrameName,
-            sal_Int32 nSearchFlags,
+            const OUString& sRecipientFrameName,
+            sal_Int32 nSearchOptions,
             const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
         throw( css::io::IOException,
                css::lang::IllegalArgumentException,
@@ -167,8 +167,8 @@ public:
     virtual css::uno::Reference< css::frame::XFramesSupplier >  SAL_CALL getCreator                         (                                                                                                   ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual OUString                                     SAL_CALL getName                            (                                                                                                   ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual void                                                SAL_CALL setName                            (   const   OUString&                                                    sName               ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::frame::XFrame >           SAL_CALL findFrame                          (   const   OUString&                                                    sTargetFrameName    ,
-                                                                                                                        sal_Int32                                                           nSearchFlags        ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::frame::XFrame >           SAL_CALL findFrame                          (   const   OUString&                                                    sRecipientFrameName    ,
+                                                                                                                        sal_Int32                                                           nSearchOptions        ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual sal_Bool                                            SAL_CALL isTop                              (                                                                                                   ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual void                                                SAL_CALL activate                           (                                                                                                   ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual void                                                SAL_CALL deactivate                         (                                                                                                   ) throw( css::uno::RuntimeException, std::exception ) override;
@@ -194,8 +194,8 @@ public:
     //  XDispatchProvider
 
     virtual css::uno::Reference< css::frame::XDispatch >        SAL_CALL queryDispatch                      (   const   css::util::URL&                                                     aURL                ,
-                                                                                                                const   OUString&                                                    sTargetFrameName    ,
-                                                                                                                        sal_Int32                                                           nSearchFlags        ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                                const   OUString&                                                    sRecipientFrameName    ,
+                                                                                                                        sal_Int32                                                           nSearchOptions        ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual css::uno::Sequence<
                 css::uno::Reference< css::frame::XDispatch > >  SAL_CALL queryDispatches                    (   const   css::uno::Sequence< css::frame::DispatchDescriptor >&               lDescriptor         ) throw( css::uno::RuntimeException, std::exception ) override;
 
@@ -369,12 +369,12 @@ private:
 
     void impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent);
 
-    /*-****************************************************************************************************
+    /*
         @short      helper methods
         @descr      Follow methods are needed at different points of our code (more than ones!).
 
         @attention  Threadsafe methods are signed by "implts_..."!
-    *//*-*****************************************************************************************************/
+    */
 
     // threadsafe
     void implts_sendFrameActionEvent     ( const css::frame::FrameAction&                        aAction          );
@@ -440,7 +440,7 @@ private:
 };
 
 
-/*-****************************************************************************************************
+/*
     @short      standard constructor to create instance by factory
     @descr      This constructor initialize a new instance of this class by valid factory,
                 and will be set valid values on his member and baseclasses.
@@ -458,7 +458,7 @@ private:
     @param      xContext is the multi service manager, which creates this instance.
                     The value must be different from NULL!
     @onerror    ASSERT in debug version or nothing in release version.
-*//*-*****************************************************************************************************/
+*/
 Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext )
         : PartialWeakComponentImplHelper(m_aMutex)
         //  init member
@@ -487,9 +487,9 @@ void Frame::initListeners()
 {
     css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW);
 
-    // Initialize a new dispatchhelper-object to handle dispatches.
-    // We use these helper as slave for our interceptor helper ... not directly!
-    // But he is event listener on THIS instance!
+    // Initialize a new dispatch helper object to handle dispatches.
+    // That helper is used as slave for interceptor helper ... indirectly
+    // And it is event listener on THIS instance
     DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this );
     css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY );
 
@@ -498,29 +498,29 @@ void Frame::initListeners()
 
     // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism.
     // Set created dispatch provider as slowest slave of it.
-    // Hold interception helper by reference only - not by pointer!
-    // So it's easier to destroy it.
+    // Hold interception helper by reference only - not by pointer
+    // So it's easier to release it.
     InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
     m_xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
 
     // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess.
-    // We hold member as reference ... not as pointer too!
+    // We hold member as reference ... not as pointer too
     // Attention: We share our frame container with this helper. Container is threadsafe himself ... So I think we can do that.
-    // But look on dispose() for right order of deinitialization.
+    // But look on dispose() for sequence of deinitialization.
     OFrames* pFramesHelper = new OFrames( this, &m_aChildFrameContainer );
     m_xFramesHelper.set( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY );
 
-    // Initialize a the drop target listener.
-    // We hold member as reference ... not as pointer too!
+    // Initialize a drop listener.
+    // We hold member as reference ... not as pointer too
     OpenFileDropTargetListener* pDropListener = new OpenFileDropTargetListener( m_xContext, this );
     m_xDropTargetListener.set( static_cast< ::cppu::OWeakObject* >(pDropListener), css::uno::UNO_QUERY );
 
     // Safe impossible cases
-    // We can't work without these helpers!
-    SAL_WARN_IF( !xDispatchProvider.is(), "fwk", "Frame::Frame(): Slowest slave for dispatch- and interception helper is not valid. XDispatchProvider, XDispatch, XDispatchProviderInterception are not full supported!" );
-    SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk", "Frame::Frame(): Interception helper is not valid. XDispatchProvider, XDispatch, XDispatchProviderInterception are not full supported!" );
-    SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper is not valid. XFrames, XIndexAccess and XElementAcces are not supported!" );
-    SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper is not valid. Drag and drop without functionality!" );
+    // We can't work without these helpers
+    SAL_WARN_IF( !xDispatchProvider.is(), "fwk", "XDispatchProvider, XDispatch, XDispatchProviderInterception are not completely supported" );
+    SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk", "Interception helper is not implemented. XDispatchProvider, XDispatch, XDispatchProviderInterception are not fully supported" );
+    SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "XFrames, XIndexAccess and XElementAccess are not completely supported" );
+    SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "DropTarget helper is absent therefore no drag'n'drop" );
 
     // establish notifies for changing of "disabled commands" configuration during runtime
     m_aCommandOptions.EstablishFrameCallback(this);
@@ -563,25 +563,25 @@ void Frame::initListeners()
             css::beans::PropertyAttribute::TRANSIENT));
 }
 
-/*-************************************************************************************************************
+/*
     @interface  XComponentLoader
     @short      try to load given URL into a task
     @descr      You can give us some information about the content, which you will load into a frame.
-                We search or create this target for you, make a type detection of given URL and try to load it.
+                We search or create this recipient for you, make a type detection of given URL and try to load it.
                 As result of this operation we return the new created component or nothing, if loading failed.
     @param      "sURL"              , URL, which represent the content
-    @param      "sTargetFrameName"  , name of target frame or special value like "_self", "_blank" ...
-    @param      "nSearchFlags"      , optional arguments for frame search, if target is not a special one
+    @param      "sRecipientFrameName"  , name of recipient frame or special value like "_self", "_blank" ...
+    @param      "nSearchOptions"      , optional arguments for frame search, if recipient is not a special one
     @param      "lArguments"        , optional arguments for loading
     @return     A valid component reference, if loading was successfully.
                 A null reference otherwise.
 
     @onerror    We return a null reference.
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const OUString&                                 sURL            ,
-                                                                                   const OUString&                                 sTargetFrameName,
-                                                                                         sal_Int32                                        nSearchFlags    ,
+                                                                                   const OUString&                                 sRecipientFrameName,
+                                                                                         sal_Int32                                        nSearchOptions    ,
                                                                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments      ) throw( css::io::IOException                ,
                                                                                                                                                                    css::lang::IllegalArgumentException ,
                                                                                                                                                                    css::uno::RuntimeException, std::exception          )
@@ -589,10 +589,10 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
     checkDisposed();
 
     css::uno::Reference< css::frame::XComponentLoader > xThis(static_cast< css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY);
-    return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, sTargetFrameName, nSearchFlags, lArguments);
+    return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, sRecipientFrameName, nSearchOptions, lArguments);
 }
 
-/*-****************************************************************************************************
+/*
     @short      return access to append or remove children on desktop
     @descr      We don't implement these interface directly. We use a helper class to do this.
                 If you wish to add or delete children to/from the container, call these method to get
@@ -602,7 +602,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
     @return     A reference to the helper which answer your queries.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -613,7 +613,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
     return m_xFramesHelper;
 }
 
-/*-****************************************************************************************************
+/*
     @short      get the current active child frame
     @descr      It must be a frameto. Direct children of a frame are frames only! No task or desktop is accepted.
                 We don't save this information directly in this class. We use our container-helper
@@ -625,7 +625,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
     @return     A null reference, if nobody is active.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -636,7 +636,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
     return m_aChildFrameContainer.getActive();
 }
 
-/*-****************************************************************************************************
+/*
     @short      set the new active direct child frame
     @descr      It must be a frame to. Direct children of frame are frames only! No task or desktop is accepted.
                 We don't save this information directly in this class. We use our container-helper
@@ -647,7 +647,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
 
     @param      "xFrame", reference to new active child. It must be an already existing child!
     @onerror    An assertion is thrown and element is ignored, if given frame isn't already a child of us.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -711,7 +711,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
     }
 }
 
-/*-****************************************************************************************************
+/*
    initialize new created layout manager
 **/
 void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager,
@@ -727,7 +727,7 @@ void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManag
     xLayoutManager->setDockingAreaAcceptor(xDockingAreaAcceptor);
 }
 
-/*-****************************************************************************************************
+/*
    deinitialize layout manager
 **/
 void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager)
@@ -737,7 +737,7 @@ void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutM
     xLayoutManager->attachFrame(css::uno::Reference< css::frame::XFrame >());
 }
 
-/*-****************************************************************************************************
+/*
     @short      initialize frame instance
     @descr      A frame needs a window. This method set a new one ... but should called one times only!
                 We use this window to listen for window events and forward it to our set component.
@@ -749,7 +749,7 @@ void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutM
 
     @param      "xWindow", reference to new container window - must be valid!
     @onerror    We do nothing.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -812,7 +812,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     pTitleHelper->setOwner(xThis);
 }
 
-/*-****************************************************************************************************
+/*
     @short      returns current set container window
     @descr      The ContainerWindow property is used as a container for the component
                 in this frame. So this object implements a container interface too.
@@ -823,14 +823,14 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     @return     A reference to current set containerwindow.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_xContainerWindow;
 }
 
-/*-****************************************************************************************************
+/*
     @short      set parent frame
     @descr      We need a parent to support some functionality! e.g. findFrame()
                 By the way we use the chance to set an internal information about our top state.
@@ -846,7 +846,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th
                     valid reference to our new owner frame, which should implement a supplier interface
 
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -861,7 +861,7 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
     m_bIsFrameTop = ( xIsDesktop.is() || ! xCreator.is() );
 }
 
-/*-****************************************************************************************************
+/*
     @short      returns current parent frame
     @descr      The Creator is the parent frame container. If it is NULL, the frame is the uppermost one.
 
@@ -869,7 +869,7 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
     @return     A reference to current set parent frame container.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -877,51 +877,47 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
     return m_xParent;
 }
 
-/*-****************************************************************************************************
-    @short      returns current set name of frame
-    @descr      This name is used to find target of findFrame() or queryDispatch() calls.
+/*
+    @short      returns current name of frame
 
     @seealso    method setName()
-    @return     Current set name of frame.
+    @return     Current name of frame.
 
     @onerror    An empty string is returned.
-*//*-*****************************************************************************************************/
+*/
 OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_sName;
 }
 
-/*-****************************************************************************************************
+/*
     @short      set new name for frame
-    @descr      This name is used to find target of findFrame() or queryDispatch() calls.
-
-    @attention  Special names like "_blank", "_self" aren't allowed...
-                "_beamer" excepts this rule!
 
-    @seealso    method getName()
+    @attention  Special names like "_blank", "_self" aren't allowed
+                "_beamer" excepts this rule
 
     @param      "sName", new frame name.
     @onerror    We do nothing.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
-    // Set new name... but look for invalid special target names!
+    // Set new name... but look for special cases
     // They are not allowed to set.
-    if (TargetHelper::isValidNameForFrame(sName))
+    if ( DeliveryHelper::isValidNameForFrame( sName ) )
         m_sName = sName;
 }
 
-/*-****************************************************************************************************
+/*
     @short      search for frames
     @descr      This method searches for a frame with the specified name.
                 Frames may contain other frames (e.g. a frameset) and may
                 be contained in other frames. This hierarchy is searched by
                 this method.
                 First some special names are taken into account, i.e. "",
-                "_self", "_top", "_blank" etc. The nSearchFlags are ignored
-                when comparing these names with sTargetFrameName, further steps are
+                "_self", "_top", "_blank" etc. The nSearchOptions are ignored
+                when comparing these names with sRecipientFrameName, further steps are
                 controlled by the search flags. If allowed, the name of the frame
                 itself is compared with the desired one, then ( again if allowed )
                 the method findFrame() is called for all children, for siblings
@@ -930,31 +926,27 @@ void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeEx
                 a new top one is created, if this is allowed by a special
                 flag. The new frame also gets the desired name.
 
-    @param      sTargetFrameName
-                    special names (_blank, _self) or real name of target frame
-    @param      nSearchFlags
-                    optional flags which regulate search for non special target frames
+    @param      sRecipientFrameName
+                    special names (_blank, _self) or real name of frame
+    @param      nSearchOptions
+                    optional flags which regulate search for non special cases
 
     @return     A reference to found or may be new created frame.
     @threadsafe yes
-*//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString&  sTargetFrameName,
-                                                                           sal_Int32         nSearchFlags    ) throw( css::uno::RuntimeException, std::exception )
+*/
+css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString&  sFrameName,
+                                                                           sal_Int32         nSearchOptions    ) throw( css::uno::RuntimeException, std::exception )
 {
-    css::uno::Reference< css::frame::XFrame > xTarget;
+    css::uno::Reference< css::frame::XFrame > xFrame;
 
-    // 0) Ignore wrong parameter!
-    //    We don't support search for following special targets.
-    //    If we reject this requests - we must not check for such names
-    //    in following code again and again. If we do not so -wrong
-    //    search results can occur!
+    // 0) Ignore special parameter
 
-    if ( sTargetFrameName == SPECIALTARGET_DEFAULT ) // valid for dispatches - not for findFrame()!
+    if ( sFrameName == SPECIAL_DEFAULT ) // it's for dispatches - not for findFrame()
     {
         return nullptr;
     }
 
-    // I) check for special defined targets first which must be handled exclusive.
+    // I) check for special cases first
     //    force using of "if() else if() ..."
 
     // get threadsafe some necessary member which are necessary for following functionality
@@ -967,62 +959,62 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
     /* } SAFE */
 
     // I.I) "_blank"
-    //  Not allowed for a normal frame - but for the desktop.
+    //  It's not for a normal frame - but for the desktop.
     //  Use helper class to do so. It use the desktop automatically.
 
-    if ( sTargetFrameName==SPECIALTARGET_BLANK )
+    if ( sFrameName == SPECIAL_BLANK )
     {
         TaskCreator aCreator(m_xContext);
-        xTarget = aCreator.createTask(sTargetFrameName);
+        xFrame = aCreator.createTask( sFrameName );
     }
 
     // I.II) "_parent"
-    //  It doesn't matter if we have a valid parent or not. User ask for him and get it.
-    //  An empty result is a valid result too.
+    //  It doesn't matter if we have a parent or not. User ask for him and get it.
+    //  An empty result is a result too.
 
-    else if ( sTargetFrameName==SPECIALTARGET_PARENT )
+    else if ( sFrameName == SPECIAL_PARENT )
     {
-        xTarget = xParent;
+        xFrame = xParent;
     }
 
     // I.III) "_top"
     //  If we are not the top frame in this hierarchy, we must forward request to our parent.
     //  Otherwhise we must return ourself.
 
-    else if ( sTargetFrameName==SPECIALTARGET_TOP )
+    else if ( sFrameName == SPECIAL_TOP )
     {
         if (bIsTopFrame)
-            xTarget = this;
+            xFrame = this;
         else if (xParent.is()) // If we are not top - the parent MUST exist. But may it's better to check it again .-)
-            xTarget = xParent->findFrame(SPECIALTARGET_TOP,0);
+            xFrame = xParent->findFrame( SPECIAL_TOP, 0 );
     }
 
     // I.IV) "_self", ""
     //  This mean this frame in every case.
 
     else if (
-        ( sTargetFrameName==SPECIALTARGET_SELF ) ||
-        ( sTargetFrameName.isEmpty()           )
+         ( sFrameName == SPECIAL_SELF ) ||
+         ( sFrameName.isEmpty() )
        )
     {
-        xTarget = this;
+        xFrame = this;
     }
 
     // I.V) "_beamer"
     //  This is a special sub frame of any task. We must return it if we found it on our direct children
     //  or create it there if it not already exists.
-    //  Note: Such beamer exists for task(top) frames only!
+    //  Note: Such beamer exists for task(top) frames only
 
-    else if ( sTargetFrameName==SPECIALTARGET_BEAMER )
+    else if ( sFrameName == SPECIAL_BEAMER )
     {
         // We are a task => search or create the beamer
         if (bIsTopWindow)
         {
-            xTarget = m_aChildFrameContainer.searchOnDirectChildrens(SPECIALTARGET_BEAMER);
-            if ( ! xTarget.is() )
+            xFrame = m_aChildFrameContainer.searchOnDirectChildrens( SPECIAL_BEAMER );
+            if ( ! xFrame.is() )
             {
                 /* TODO
-                    Creation not supported yet!
+                    Creation is not supported yet
                     Wait for new layout manager service because we can't plug it
                     inside already opened document of this frame ...
                 */
@@ -1030,7 +1022,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         }
         // We arent a task => forward request to our parent or ignore it.
         else if (xParent.is())
-            xTarget = xParent->findFrame(SPECIALTARGET_BEAMER,0);
+            xFrame = xParent->findFrame( SPECIAL_BEAMER, 0 );
     }
 
     else
@@ -1038,7 +1030,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
 
         // II) otherwise use optional given search flags
         //  force using of combinations of such flags. means no "else" part of use if() statements.
-        //  But we ust break further searches if target was already found.
+        //  But we ust break further searches if a recipient was already found.
         //  Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
         //  TASK and CREATE are handled special.
 
@@ -1054,25 +1046,25 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         //  ignore this flag.
 
         if (
-            (nSearchFlags &  css::frame::FrameSearchFlag::SELF)  &&
-            (sOwnName     == sTargetFrameName                 )
+             (  nSearchOptions &  css::frame::FrameSearchOption::Self  )  &&
+             (  sOwnName  ==  sFrameName  )
            )
         {
-            xTarget = this;
+            xFrame = this;
         }
 
         // II.II) CHILDREN
-        //  Search on all children for the given target name.
+        //  Search on all children for the given recipient.
         //  An empty name value can't occur here - because it must be already handled as "_self"
         //  before. Used helper function of container doesn't create any frame.
         //  It makes a deep search only.
 
         if (
-            ( ! xTarget.is()                                     ) &&
-            (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN)
+            ( ! xFrame.is()                                     ) &&
+            (nSearchOptions & css::frame::FrameSearchOption::Children)
            )
         {
-            xTarget = m_aChildFrameContainer.searchOnAllChildrens(sTargetFrameName);
+            xFrame = m_aChildFrameContainer.searchOnAllChildrens( sFrameName );
         }
 
         // II.III) TASKS
@@ -1082,7 +1074,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         //  or we can ignore it if we have no valid parent.
 
         if (
-            (   bIsTopFrame && (nSearchFlags & css::frame::FrameSearchFlag::TASKS) )   ||
+            (   bIsTopFrame && (nSearchOptions & css::frame::FrameSearchOption::Tasks) )   ||
             ( ! bIsTopFrame                                                        )
            )
         {
@@ -1100,8 +1092,8 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             //  XIndexAccess instead of XFrames.
 
             if (
-                ( ! xTarget.is()                                      ) &&
-                (nSearchFlags &  css::frame::FrameSearchFlag::SIBLINGS) &&
+                ( ! xFrame.is()                                      ) &&
+                (nSearchOptions &  css::frame::FrameSearchOption::Siblings) &&
                 (   xParent.is()                                      ) // search on siblings is impossible without a parent
                )
             {
@@ -1126,12 +1118,12 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
 
                             // Don't allow upper search here! Use right flags to regulate it.
                             // And allow deep search on children only - if it was allowed for us too.
-                            sal_Int32 nRightFlags = css::frame::FrameSearchFlag::SELF;
-                            if (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN)
-                                nRightFlags |= css::frame::FrameSearchFlag::CHILDREN;
-                            xTarget = xSibling->findFrame(sTargetFrameName, nRightFlags );
+                            sal_Int32 nRightFlags = css::frame::FrameSearchOption::Self;
+                            if (nSearchOptions & css::frame::FrameSearchOption::Children)
+                                nRightFlags |= css::frame::FrameSearchOption::Children;
+                            xFrame = xSibling->findFrame( sFrameName, nRightFlags );
                             // perform search be breaking further search if a result exist.
-                            if (xTarget.is())
+                            if ( xFrame.is() )
                                 break;
                         }
                     }
@@ -1144,40 +1136,40 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             //  to search on his children too) we must change used search flags.
 
             if (
-                ( ! xTarget.is()                                    ) &&
-                (nSearchFlags &  css::frame::FrameSearchFlag::PARENT) &&
+                ( ! xFrame.is()                                    ) &&
+                (nSearchOptions &  css::frame::FrameSearchOption::Parent) &&
                 (   xParent.is()                                    )
                )
             {
-                if (xParent->getName() == sTargetFrameName)
-                    xTarget = xParent;
+                if ( xParent->getName() == sFrameName )
+                    xFrame = xParent;
                 else
                 {
-                    sal_Int32 nRightFlags  = nSearchFlags;
-                              nRightFlags &= ~css::frame::FrameSearchFlag::CHILDREN;
-                    xTarget = xParent->findFrame(sTargetFrameName, nRightFlags);
+                    sal_Int32 nOptions  = nSearchOptions;
+                              nOptions &= ~css::frame::FrameSearchOption::Children;
+                    xFrame = xParent->findFrame( sFrameName, nOptions );
                 }
             }
         }
 
         // II.IV) CREATE
-        //  If we haven't found any valid target frame by using normal flags - but user allowed us to create
-        //  a new one ... we should do that. Used TaskCreator use Desktop instance automatically as parent!
+        //  If we haven't found any frame by using normal flags - but user allowed us to create
+        //  a new one ... we should do that. Used TaskCreator use Desktop instance automatically as parent
 
         if (
-            ( ! xTarget.is()                                   )    &&
-            (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
+            ( ! xFrame.is()                                   )    &&
+            (nSearchOptions & css::frame::FrameSearchOption::Create)
            )
         {
             TaskCreator aCreator(m_xContext);
-            xTarget = aCreator.createTask(sTargetFrameName);
+            xFrame = aCreator.createTask( sFrameName );
         }
     }
 
-    return xTarget;
+    return xFrame;
 }
 
-/*-****************************************************************************************************
+/*
     @descr      Returns sal_True, if this frame is a "top frame", otherwise sal_False.
                 The "m_bIsFrameTop" member must be set in the ctor or setCreator() method.
                 A top frame is a member of the top frame container or a member of the
@@ -1188,9 +1180,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
     @seealso    method setCreator()
     @seealso    method findFrame()
     @return     true, if is it a top frame ... false otherwise.
-
-    @onerror    No error should occur!
-*//*-*****************************************************************************************************/
+*/
 sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1200,7 +1190,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::excepti
     return m_bIsFrameTop;
 }
 
-/*-****************************************************************************************************
+/*
     @short      activate frame in hierarchy
     @descr      This feature is used to mark active paths in our frame hierarchy.
                 You can be a listener for this event to react for it ... change some internal states or something else.
@@ -1209,7 +1199,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::excepti
     @seealso    method isActivate()
     @seealso    enum EActiveState
     @seealso    listener mechanism
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1241,18 +1231,18 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
         if( xParent.is() )
         {
             // Every time set THIS frame as active child of parent and activate it.
-            // We MUST have a valid path from bottom to top as active path!
+            // We NEED a valid path from bottom to top as active path
             // But we must deactivate the old active sibling path first.
 
-            // Attention: Deactivation of an active path, deactivate the whole path ... from bottom to top!
+            // Attention: Deactivation of an active path, deactivate the whole path ... from bottom to top
             // But we wish to deactivate founded sibling-tree only.
             // [ see deactivate() / step 4) for further information! ]
 
             xParent->setActiveFrame( xThis );
 
             // Then we can activate from here to top.
-            // Attention: We are ACTIVE now. And the parent will call activate() at us!
-            // But we do nothing then! We are already activated.
+            // Attention: We are ACTIVE now. And the parent will call activate() at us
+            // But we do nothing then. We are already activated.
             xParent->activate();
         }
         // Its necessary to send event NOW - not before.
@@ -1263,14 +1253,14 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
 
     //  2)  I was active before or current activated and there is a path from here to bottom, who CAN be active.
     //      But our direct child of path is not active yet.
-    //      (It can be, if activation occur in the middle of a current path!)
-    //      In these case we activate path to bottom to set focus on right frame!
+    //      (It can be, if activation occurs in the middle of a current path)
+    //      In this case activate path to bottom to set focus on right frame
     if ( eState == E_ACTIVE && xActiveChild.is() && !xActiveChild->isActive() )
     {
         xActiveChild->activate();
     }
 
-    //  3)  I was active before or current activated. But if I have no active child => I will get the focus!
+    //  3)  I was active before or current activated. But if I have no active child => I will get the focus
     if ( eState == E_ACTIVE && !xActiveChild.is() )
     {
         aWriteLock.reset();
@@ -1281,7 +1271,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      deactivate frame in hierarchy
     @descr      This feature is used to deactive paths in our frame hierarchy.
                 You can be a listener for this event to react for it ... change some internal states or something else.
@@ -1290,7 +1280,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
     @seealso    method isActivate()
     @seealso    enum EActiveState
     @seealso    listener mechanism
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1354,7 +1344,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      returns active state
     @descr      Call it to get information about current active state of this frame.
 
@@ -1364,7 +1354,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
     @return     true if active, false otherwise.
 
     @onerror    No error should occur.
-*//*-*****************************************************************************************************/
+*/
 sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1375,9 +1365,9 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce
             );
 }
 
-/*-****************************************************************************************************
+/*
     @short      ???
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::exception )
 {
     // Sometimes called during closing object...
@@ -1386,7 +1376,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
     implts_sendFrameActionEvent( css::frame::FrameAction_CONTEXT_CHANGED );
 }
 
-/*-****************************************************************************************************
+/*
     @short      set new component inside the frame
     @descr      A frame is a container for a component. Use this method to set, change or release it!
                 We accept null references! The xComponentWindow will be a child of our container window
@@ -1413,7 +1403,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
 
     @onerror    We return <FALSE/>.
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::XWindow >&       xComponentWindow ,
                                         const   css::uno::Reference< css::frame::XController >& xController      ) throw( css::uno::RuntimeException, std::exception )
 {
@@ -1556,7 +1546,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     return true;
 }
 
-/*-****************************************************************************************************
+/*
     @short      returns current set component window
     @descr      Frames are used to display components. The actual displayed component is
                 held by the m_xComponentWindow property. If the component implements only a
@@ -1571,7 +1561,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     @return     css::uno::Reference to current set component window.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1579,7 +1569,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th
     return m_xComponentWindow;
 }
 
-/*-****************************************************************************************************
+/*
     @short      returns current set controller
     @descr      Frames are used to display components. The actual displayed component is
                 held by the m_xComponentWindow property. If the component implements only a
@@ -1594,14 +1584,14 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th
     @return     css::uno::Reference to current set controller.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_xController;
 }
 
-/*-****************************************************************************************************
+/*
     @short      add/remove listener for activate/deactivate/contextChanged events
     @seealso    method activate()
     @seealso    method deactivate()
@@ -1609,7 +1599,7 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t
 
     @param      "xListener" reference to your listener object
     @onerror    Listener is ignored.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -1621,7 +1611,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
     m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
 }
 
-/*-****************************************************************************************************
+/*
     @short      support two way mechanism to release a frame
     @descr      This method ask internal component (controller) if he accept this close request.
                 In case of <TRUE/> nothing will be happen (from point of caller of this close method).
@@ -1639,7 +1629,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
                     if any internal things willn't be closed
 
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
                                                                 css::uno::RuntimeException, std::exception   )
 {
@@ -1716,7 +1706,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
     dispose();
 }
 
-/*-****************************************************************************************************
+/*
     @short      be a listener for close events!
     @descr      Adds/remove a CloseListener at this frame instance. If the close() method is called on
                 this object, the such listener are informed and can disagree with that by throwing
@@ -1730,7 +1720,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
     @onerror    Listener is ignored.
 
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
@@ -2029,7 +2019,6 @@ sal_Bool SAL_CALL Frame::hasPropertyByName(const OUString& sName)
     return bExist;
 }
 
-/*-****************************************************************************************************/
 void Frame::implts_forgetSubFrames()
 {
     // SAFE ->
@@ -2062,7 +2051,7 @@ void Frame::implts_forgetSubFrames()
     m_aChildFrameContainer.clear(); // clear container content
 }
 
-/*-****************************************************************************************************
+/*
     @short      destroy instance
     @descr      The owner of this object calles the dispose method if the object
                 should be destroyed. All other objects and components, that are registered
@@ -2075,7 +2064,7 @@ void Frame::implts_forgetSubFrames()
 
     @seealso    method initialize()
     @seealso    baseclass FairRWLockBase!
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::disposing()
 {
     // We should hold a reference to ourself ...
@@ -2227,13 +2216,13 @@ void SAL_CALL Frame::disposing()
     Application::SetDialogCancelMode( old );
 }
 
-/*-****************************************************************************************************
+/*
     @short      Be a listener for dispose events!
     @descr      Adds/remove an EventListener to this object. If the dispose method is called on
                 this object, the disposing method of the listener is called.
     @param      "xListener" reference to your listener object.
     @onerror    Listener is ignored.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -2245,7 +2234,7 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
     m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
-/*-****************************************************************************************************
+/*
     @short      create new status indicator
     @descr      Use returned status indicator to show progresses and some text information.
                 All created objects share the same dialog! Only the last one can show his information.
@@ -2255,7 +2244,7 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
     @return     A reference to created object.
 
     @onerror    We return a null reference.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator() throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -2281,30 +2270,23 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
     return css::uno::Reference< css::task::XStatusIndicator >();
 }
 
-/*-****************************************************************************************************
-    @short      search for target to load URL
+/*
+    @short      search for recipient to load URL
     @descr      This method searches for a dispatch for the specified DispatchDescriptor.
-                The FrameSearchFlags and the FrameName of the DispatchDescriptor are
+                The nSearchOptions and sFrameName of the DispatchDescriptor are
                 treated as described for findFrame.
 
-    @seealso    method findFrame()
-    @seealso    method queryDispatches()
-    @seealso    method set/getName()
-    @seealso    class TargetFinder
-
-    @param      "aURL"              , URL for loading
-    @param      "sTargetFrameName"  , name of target frame
-    @param      "nSearchFlags"      , additional flags to regulate search if sTargetFrameName is not clear
+    @param      "aURL", URL for loading
+    @param      "sFrameName", name of recipient frame
+    @param      "nSearchOptions", additional flags to regulate search if sFrameName is not clear
     @return     css::uno::Reference to dispatch handler.
 
     @onerror    A null reference is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL&   aURL            ,
-                                                                            const OUString&  sTargetFrameName,
-                                                                                  sal_Int32         nSearchFlags    ) throw( css::uno::RuntimeException, std::exception )
+                                                                            const OUString&  sFrameName ,
+                                                                                  sal_Int32         nSearchOptions    ) throw( css::uno::RuntimeException, std::exception )
 {
-    // Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
-
     checkDisposed();
 
     // Remove uno and cmd protocol part as we want to support both of them. We store only the command part
@@ -2327,11 +2309,11 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
         if (!disp.is()) {
             throw css::lang::DisposedException("Frame disposed");
         }
-        return disp->queryDispatch( aURL, sTargetFrameName, nSearchFlags );
+        return disp->queryDispatch( aURL, sFrameName, nSearchOptions );
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      handle more than ones dispatches at same call
     @descr      Returns a sequence of dispatches. For details see the queryDispatch method.
                 For failed dispatches we return empty items in list!
@@ -2342,7 +2324,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
     @return     List of dispatch references. Some elements can be NULL!
 
     @onerror    An empty list is returned.
-*//*-*****************************************************************************************************/
+*/
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
 {
     // Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
@@ -2361,7 +2343,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
     return disp->queryDispatches( lDescriptor );
 }
 
-/*-****************************************************************************************************
+/*
     @short      register/unregister interceptor for dispatch calls
     @descr      If you wish to handle some dispatches by himself ... you should be
                 an interceptor for it. Please see class OInterceptionHelper for further information.
@@ -2370,7 +2352,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
 
     @param      "xInterceptor", reference to your interceptor implementation.
     @onerror    Interceptor is ignored.
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception )
 {
     // We use a helper to support these interface and an interceptor mechanism.
@@ -2407,10 +2389,10 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      provides information about all possible dispatch functions
                 inside the current frame environment
-*//*-*****************************************************************************************************/
+*/
 css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups()
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -2423,7 +2405,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu
     return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup);
 }
 
-/*-****************************************************************************************************
+/*
     @short      notifications for window events
     @descr      We are a listener on our container window to forward it to our component window.
 
@@ -2432,7 +2414,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu
     @seealso    member m_xComponentWindow
 
     @param      "aEvent" describe source of detected event
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& ) throw( css::uno::RuntimeException, std::exception )
 {
     // Part of dispose-mechanism
@@ -2460,7 +2442,7 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& ) throw( css::uno:
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      notifications for window events
     @descr      We are a listener on our container window to forward it to our component window ...
                 but a XTopWindowListener we are only if we are a top frame!
@@ -2470,7 +2452,7 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& ) throw( css::uno:
     @seealso    member m_xComponentWindow
 
     @param      "aEvent" describe source of detected event
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::windowActivated( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
@@ -2555,7 +2537,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
     css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext));
     xParser->parseStrict(aURL);
 
-    css::uno::Reference< css::frame::XDispatch > xCloser = queryDispatch(aURL, SPECIALTARGET_SELF, 0);
+    css::uno::Reference< css::frame::XDispatch > xCloser = queryDispatch( aURL, SPECIAL_SELF, 0 );
     if (xCloser.is())
         xCloser->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >());
 
@@ -2564,7 +2546,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
     // Or if it will be reached it will be for sure that all your member are gone .-)
 }
 
-/*-****************************************************************************************************
+/*
     @short      react for a show event for the internal container window
     @descr      Normally we don't need this information really. But we can use it to
                 implement the special feature "trigger first visible task".
@@ -2585,7 +2567,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
                     We are not interested on this information. We are interested on the visible state only.
 
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
 {
     static bool bFirstVisibleTask = true;
@@ -2627,7 +2609,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un
     impl_checkMenuCloser();
 }
 
-/*-****************************************************************************************************
+/*
     @short      called by dispose of our windows!
     @descr      This object is forced to release all references to the interfaces given
                 by the parameter source. We are a listener at our container window and
@@ -2636,7 +2618,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un
     @seealso    XWindowListener
     @seealso    XTopWindowListener
     @seealso    XFocusListener
-*//*-*****************************************************************************************************/
+*/
 void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -2652,7 +2634,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs
     }
 }
 
-/*-************************************************************************************************************
+/*
     @interface  com.sun.star.document.XActionLockable
     @short      implement locking of frame/task from outside
     @descr      Sometimes we have problems to decide if closing of task is allowed. Because; frame/task
@@ -2666,7 +2648,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs
     @return     true if frame/task is locked
                 false otherwise
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
@@ -2906,11 +2888,11 @@ void Frame::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEv
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      send frame action event to our listener
     @descr      This method is threadsafe AND can be called by our dispose method too!
     @param      "aAction", describe the event for sending
-*//*-*****************************************************************************************************/
+*/
 void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction )
 {
     // Sometimes used by dispose()
@@ -2959,12 +2941,12 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      helper to resize our component window
     @descr      A frame contains 2 windows - a container ~ and a component window.
                 This method resize inner component window to full size of outer container window.
                 This method is threadsafe AND can be called by our dispose method too!
-*//*-*****************************************************************************************************/
+*/
 void Frame::implts_resizeComponentWindow()
 {
     // usually the LayoutManager does the resizing
@@ -2988,7 +2970,7 @@ void Frame::implts_resizeComponentWindow()
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      helper to set icon on our container window (if it is a system window!)
     @descr      We use our internal set controller (if it exist) to specify which factory he represented.
                 These information can be used to find right icon. But our controller can say it us directly
@@ -2996,7 +2978,7 @@ void Frame::implts_resizeComponentWindow()
 
     @seealso    method Window::SetIcon()
     @onerror    We do nothing.
-*//*-*****************************************************************************************************/
+*/
 void Frame::implts_setIconOnWindow()
 {
     checkDisposed();
@@ -3073,7 +3055,7 @@ void Frame::implts_setIconOnWindow()
     }
 }
 
-/*-************************************************************************************************************
+/*
     @short      helper to start/stop listeneing for window events on container window
     @descr      If we get a new container window, we must set it on internal member ...
                 and stop listening at old one ... and start listening on new one!
@@ -3084,7 +3066,7 @@ void Frame::implts_setIconOnWindow()
     @seealso    method dispose()
     @onerror    We do nothing!
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void Frame::implts_startWindowListening()
 {
     checkDisposed();
@@ -3157,7 +3139,7 @@ void Frame::implts_stopWindowListening()
     }
 }
 
-/*-****************************************************************************************************
+/*
     @short      helper to force breaked close() request again
     @descr      If we self disagree with a close() request, and detect that all external locks are gone ...
                 then we must try to close this frame again.
@@ -3170,7 +3152,7 @@ void Frame::implts_stopWindowListening()
     @seealso    m_nExternalLockCount
 
     @threadsafe yes
-*//*-*****************************************************************************************************/
+*/
 void Frame::implts_checkSuicide()
 {
     /* SAFE */
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 265b30e..1a2cecb 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -20,7 +20,7 @@
 #include <helper/persistentwindowstate.hxx>
 #include <helper/tagwindowasmodified.hxx>
 #include <helper/titlebarupdate.hxx>
-#include <loadenv/targethelper.hxx>
+#include <loadenv/deliveryhelper.hxx>
 #include <taskcreatordefs.hxx>
 
 #include <com/sun/star/frame/Frame.hpp>
@@ -141,18 +141,18 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
     OUString                           sFrameName                    = lArgs.getUnpackedValueOrDefault(ARGUMENT_FRAMENAME                    , OUString()                          );
     bool                                  bVisible                      = lArgs.getUnpackedValueOrDefault(ARGUMENT_MAKEVISIBLE                  , false );
     bool                                  bCreateTopWindow              = lArgs.getUnpackedValueOrDefault(ARGUMENT_CREATETOPWINDOW              , true );
-    // only possize=[0,0,0,0] triggers default handling of vcl !
+    // only possize=[0,0,0,0] triggers default handling of vcl
     css::awt::Rectangle                       aPosSize                      = lArgs.getUnpackedValueOrDefault(ARGUMENT_POSSIZE                      , css::awt::Rectangle(0, 0, 0, 0)            );
     css::uno::Reference< css::awt::XWindow >  xContainerWindow              = lArgs.getUnpackedValueOrDefault(ARGUMENT_CONTAINERWINDOW              , css::uno::Reference< css::awt::XWindow >() );
     bool                                  bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE , false );
     bool                                  bEnableTitleBarUpdate         = lArgs.getUnpackedValueOrDefault(ARGUMENT_ENABLE_TITLEBARUPDATE        , true );
 
-    // We use FrameName property to set it as API name of the new created frame later.
-    // But those frame names must be different from the set of special target names as e.g. _blank, _self etcpp !
+    // We use FrameName property to set it as API name of the fresh created frame later.
+    // But those names are different from the set of special cases like _blank, _self etc.
     OUString sRightName = impl_filterNames(sFrameName);
 
-    // if no external frame window was given ... create a new one.
-    if ( ! xContainerWindow.is())
+    // if no external frame window was given ... create a new one
+    if ( ! xContainerWindow.is() )
     {
         css::uno::Reference< css::awt::XWindow > xParentWindow;
         if (xParentFrame.is())
@@ -358,7 +358,7 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen
 OUString TaskCreatorService::impl_filterNames( const OUString& sName )
 {
     OUString sFiltered;
-    if (TargetHelper::isValidNameForFrame(sName))
+    if ( DeliveryHelper::isValidNameForFrame(sName) )
         sFiltered = sName;
     return sFiltered;
 }
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 045529b..2bcf1e3 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -114,46 +114,46 @@ throw (css::uno::RuntimeException, std::exception)
     return m_pImpl->getAllImageNames( nImageType );
 }
 
-sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
+sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aActionURL )
 throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
-    return m_pImpl->hasImage(nImageType,aCommandURL);
+    return m_pImpl->hasImage( nImageType, aActionURL );
 }
 
 Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence )
+    const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
-    return m_pImpl->getImages(nImageType,aCommandURLSequence);
+    return m_pImpl->getImages( nImageType, aActionURLSequence );
 }
 
 void SAL_CALL ImageManager::replaceImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence,
+    const Sequence< OUString >& aActionURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
 throw ( css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
+    m_pImpl->replaceImages( nImageType, aActionURLSequence, aGraphicsSequence );
 }
 
-void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
+void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->removeImages(nImageType,aCommandURLSequence);
+    m_pImpl->removeImages( nImageType, aActionURLSequence );
 }
 
-void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
 throw ( css::container::ElementExistException,
         css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
+    m_pImpl->insertImages( nImageType, aActionURLSequence, aGraphicSequence );
 }
 
 // XUIConfiguration
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index d229de9..4028ec41 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -172,16 +172,16 @@ void CmdImageList::initialize()
 }
 
 
-Image CmdImageList::getImageFromCommandURL(vcl::ImageType nImageType, const OUString& rCommandURL)
+Image CmdImageList::getImageFromActionURL(vcl::ImageType nImageType, const OUString& rActionURL)
 {
     initialize();
-    return m_aResolver.getImageFromCommandURL(nImageType, rCommandURL);
+    return m_aResolver.getImageFromCommandURL( nImageType, rActionURL );
 }
 
-bool CmdImageList::hasImage(vcl::ImageType /*nImageType*/, const OUString& rCommandURL)
+bool CmdImageList::hasImage(vcl::ImageType /*nImageType*/, const OUString& rActionURL)
 {
     initialize();
-    return m_aResolver.hasImage(rCommandURL);
+    return m_aResolver.hasImage( rActionURL );
 }
 
 std::vector<OUString>& CmdImageList::getImageCommandNames()
@@ -201,16 +201,16 @@ GlobalImageList::~GlobalImageList()
     pGlobalImageList = nullptr;
 }
 
-Image GlobalImageList::getImageFromCommandURL( vcl::ImageType nImageType, const OUString& rCommandURL )
+Image GlobalImageList::getImageFromActionURL( vcl::ImageType nImageType, const OUString& rActionURL )
 {
     osl::MutexGuard guard( getGlobalImageListMutex() );
-    return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL );
+    return CmdImageList::getImageFromActionURL( nImageType, rActionURL );
 }
 
-bool GlobalImageList::hasImage( vcl::ImageType nImageType, const OUString& rCommandURL )
+bool GlobalImageList::hasImage( vcl::ImageType nImageType, const OUString& rActionURL )
 {
     osl::MutexGuard guard( getGlobalImageListMutex() );
-    return CmdImageList::hasImage( nImageType, rCommandURL );
+    return CmdImageList::hasImage( nImageType, rActionURL );
 }
 
 ::std::vector< OUString >& GlobalImageList::getImageCommandNames()
@@ -333,7 +333,7 @@ bool ImageManagerImpl::implts_loadUserImages(
                 for ( sal_Int32 i=0; i < nCount; i++ )
                 {
                     const ImageItemDescriptor* pItem = (*pList->pImageItemList)[i].get();
-                    aUserImagesVector.push_back( pItem->aCommandURL );
+                    aUserImagesVector.push_back( pItem->aActionURL );
                 }
 
                 uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement(
@@ -405,7 +405,7 @@ bool ImageManagerImpl::implts_storeUserImages(
             {
                 ImageItemDescriptor* pItem = new ImageItemDescriptor;
                 pItem->nIndex = i;
-                pItem->aCommandURL = pImageList->GetImageName( i );
+                pItem->aActionURL = pImageList->GetImageName( i );
                 pList->pImageItemList->push_back( std::unique_ptr<ImageItemDescriptor>(pItem) );
             }
 
@@ -683,7 +683,7 @@ throw (css::uno::RuntimeException)
     return comphelper::mapKeysToSequence( aImageCmdNameMap );
 }
 
-bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
+bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aActionURL )
 throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     SolarMutexGuard g;
@@ -696,18 +696,18 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
         throw IllegalArgumentException();
 
     vcl::ImageType nIndex = implts_convertImageTypeToIndex( nImageType );
-    if ( m_bUseGlobal && implts_getGlobalImageList()->hasImage( nIndex, aCommandURL ))
+    if ( m_bUseGlobal && implts_getGlobalImageList()->hasImage( nIndex, aActionURL ))
         return true;
     else
     {
-        if ( m_bUseGlobal && implts_getDefaultImageList()->hasImage( nIndex, aCommandURL ))
+        if ( m_bUseGlobal && implts_getDefaultImageList()->hasImage( nIndex, aActionURL ))
             return true;
         else
         {
             // User layer
             ImageList* pImageList = implts_getUserImageList(nIndex);
             if ( pImageList )
-                return ( pImageList->GetImagePos( aCommandURL ) != IMAGELIST_IMAGE_NOTFOUND );
+                return ( pImageList->GetImagePos( aActionURL ) != IMAGELIST_IMAGE_NOTFOUND );
         }
     }
 
@@ -716,7 +716,7 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 
 Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence )
+    const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -728,9 +728,9 @@ throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
     if (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE ))
         throw IllegalArgumentException();
 
-    Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() );
+    Sequence< uno::Reference< XGraphic > > aGraphSeq( aActionURLSequence.getLength() );
 
-    const OUString* aStrArray = aCommandURLSequence.getConstArray();
+    const OUString* aStrArray = aActionURLSequence.getConstArray();
 
     vcl::ImageType                    nIndex            = implts_convertImageTypeToIndex( nImageType );
     rtl::Reference< GlobalImageList > rGlobalImageList;
@@ -746,14 +746,14 @@ throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
     // 1. user image list (read/write)
     // 2. module image list (read)
     // 3. global image list (read)
-    for ( sal_Int32 n = 0; n < aCommandURLSequence.getLength(); n++ )
+    for ( sal_Int32 n = 0; n < aActionURLSequence.getLength(); n++ )
     {
         Image aImage = pUserImageList->GetImage( aStrArray[n] );
         if ( !aImage && m_bUseGlobal )
         {
-            aImage = pDefaultImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
+            aImage = pDefaultImageList->getImageFromActionURL( nIndex, aStrArray[n] );
             if ( !aImage )
-                aImage = rGlobalImageList->getImageFromCommandURL( nIndex, aStrArray[n] );
+                aImage = rGlobalImageList->getImageFromActionURL( nIndex, aStrArray[n] );
         }
 
         aGraphSeq[n] = aImage.GetXGraphic();
@@ -764,7 +764,7 @@ throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 
 void ImageManagerImpl::replaceImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence,
+    const Sequence< OUString >& aActionURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
 throw (css::lang::IllegalArgumentException,
        css::lang::IllegalAccessException,
@@ -781,7 +781,7 @@ throw (css::lang::IllegalArgumentException,
         if ( m_bDisposed )
             throw DisposedException();
 
-        if (( aCommandURLSequence.getLength() != aGraphicsSequence.getLength() ) ||
+        if (( aActionURLSequence.getLength() != aGraphicsSequence.getLength() ) ||
             (( nImageType < 0 ) || ( nImageType > MAX_IMAGETYPE_VALUE )))
             throw IllegalArgumentException();
 
@@ -792,26 +792,26 @@ throw (css::lang::IllegalArgumentException,
         ImageList* pImageList = implts_getUserImageList(nIndex);
 
         uno::Reference< XGraphic > xGraphic;
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
+        for ( sal_Int32 i = 0; i < aActionURLSequence.getLength(); i++ )
         {
             // Check size and scale. If we don't have any graphics ignore it
             if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
                 continue;
 
-            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aActionURLSequence[i] );
             if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
             {
-                pImageList->AddImage(aCommandURLSequence[i], Image(xGraphic));
+                pImageList->AddImage( aActionURLSequence[i], Image(xGraphic) );
                 if ( !pInsertedImages )
                     pInsertedImages = new CmdToXGraphicNameAccess();
-                pInsertedImages->addElement( aCommandURLSequence[i], xGraphic );
+                pInsertedImages->addElement( aActionURLSequence[i], xGraphic );
             }
             else
             {
-                pImageList->ReplaceImage(aCommandURLSequence[i], Image(xGraphic));
+                pImageList->ReplaceImage( aActionURLSequence[i], Image(xGraphic) );
                 if ( !pReplacedImages )
                     pReplacedImages = new CmdToXGraphicNameAccess();
-                pReplacedImages->addElement( aCommandURLSequence[i], xGraphic );
+                pReplacedImages->addElement( aActionURLSequence[i], xGraphic );
             }
         }
 
@@ -849,7 +849,7 @@ throw (css::lang::IllegalArgumentException,
     }
 }
 
-void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
+void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException)
@@ -881,9 +881,9 @@ throw ( css::lang::IllegalArgumentException,
         ImageList*                        pImageList        = implts_getUserImageList(nIndex);
         uno::Reference< XGraphic >        xEmptyGraphic( Image().GetXGraphic() );
 
-        for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
+        for ( sal_Int32 i = 0; i < aActionURLSequence.getLength(); i++ )
         {
-            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aActionURLSequence[i] );
             if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
             {
                 Image aImage = pImageList->GetImage( nPos );
@@ -894,27 +894,27 @@ throw ( css::lang::IllegalArgumentException,
                 {
                     // Check, if we have a image in our module/global image list. If we find one =>
                     // this is a replace instead of a remove operation!
-                    Image aNewImage = pDefaultImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
+                    Image aNewImage = pDefaultImageList->getImageFromActionURL( nIndex, aActionURLSequence[i] );
                     if ( !aNewImage )
-                        aNewImage = rGlobalImageList->getImageFromCommandURL( nIndex, aCommandURLSequence[i] );
+                        aNewImage = rGlobalImageList->getImageFromActionURL( nIndex, aActionURLSequence[i] );
                     if ( !aNewImage )
                     {
                         if ( !pRemovedImages )
                             pRemovedImages = new CmdToXGraphicNameAccess();
-                        pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
+                        pRemovedImages->addElement( aActionURLSequence[i], xEmptyGraphic );
                     }
                     else
                     {
                         if ( !pReplacedImages )
                             pReplacedImages = new CmdToXGraphicNameAccess();
-                        pReplacedImages->addElement( aCommandURLSequence[i], aNewImage.GetXGraphic() );
+                        pReplacedImages->addElement( aActionURLSequence[i], aNewImage.GetXGraphic() );
                     }
                 } // if ( m_bUseGlobal )
                 else
                 {
                     if ( !pRemovedImages )
                         pRemovedImages = new CmdToXGraphicNameAccess();
-                    pRemovedImages->addElement( aCommandURLSequence[i], xEmptyGraphic );
+                    pRemovedImages->addElement( aActionURLSequence[i], xEmptyGraphic );
                 }
             }
         }
@@ -953,13 +953,13 @@ throw ( css::lang::IllegalArgumentException,
     }
 }
 
-void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
 throw ( css::container::ElementExistException,
         css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException)
 {
-    replaceImages(nImageType,aCommandURLSequence,aGraphicSequence);
+    replaceImages( nImageType, aActionURLSequence, aGraphicSequence );
 }
 
 // XUIConfigurationPersistence
@@ -1040,9 +1040,9 @@ void ImageManagerImpl::reload()
                     {
                         if ( m_bUseGlobal )
                         {
-                            Image aImage = pDefaultImageList->getImageFromCommandURL( i, pIter->first );
+                            Image aImage = pDefaultImageList->getImageFromActionURL( i, pIter->first );
                             if ( !aImage )
-                                aImage = rGlobalImageList->getImageFromCommandURL( i, pIter->first );
+                                aImage = rGlobalImageList->getImageFromActionURL( i, pIter->first );
 
                             if ( !aImage )
                             {
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 1d5022b..76fe521 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -58,8 +58,8 @@ namespace framework
             CmdImageList(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier);
             virtual ~CmdImageList();
 
-            virtual Image getImageFromCommandURL(vcl::ImageType nImageType, const OUString& rCommandURL);
-            virtual bool hasImage(vcl::ImageType nImageType, const OUString& rCommandURL);
+            virtual Image getImageFromActionURL( vcl::ImageType nImageType, const OUString& rActionURL );
+            virtual bool hasImage( vcl::ImageType nImageType, const OUString& rActionURL );
             virtual std::vector<OUString>& getImageCommandNames();
 
         protected:
@@ -79,8 +79,8 @@ namespace framework
             explicit GlobalImageList(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
             virtual ~GlobalImageList() override;
 
-            virtual Image                           getImageFromCommandURL( vcl::ImageType nImageType, const OUString& rCommandURL ) override;
-            virtual bool                            hasImage( vcl::ImageType nImageType, const OUString& rCommandURL ) override;
+            virtual Image                           getImageFromActionURL( vcl::ImageType nImageType, const OUString& rActionURL ) override;
+            virtual bool                            hasImage( vcl::ImageType nImageType, const OUString& rActionURL ) override;
             virtual ::std::vector< OUString >&      getImageCommandNames() override;
     };
 
@@ -100,11 +100,11 @@ namespace framework
             // XImageManager
             void reset() throw (css::uno::RuntimeException, css::lang::IllegalAccessException);
             css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException);
-            bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
-            css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
-            void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception);
+            bool hasImage( ::sal_Int16 nImageType, const OUString& aActionURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception);
             void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
-            void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+            void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
 
             // XUIConfiguration
             void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 323e9ab..705d2f1 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -110,47 +110,47 @@ throw (css::uno::RuntimeException, std::exception)
     return m_pImpl->getAllImageNames( nImageType );
 }
 
-sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
+sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aActionURL )
 throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
-    return m_pImpl->hasImage(nImageType,aCommandURL);
+    return m_pImpl->hasImage( nImageType, aActionURL );
 }
 
 Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence )
+    const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" );
-    return m_pImpl->getImages(nImageType,aCommandURLSequence);
+    return m_pImpl->getImages( nImageType, aActionURLSequence );
 }
 
 void SAL_CALL ModuleImageManager::replaceImages(
     ::sal_Int16 nImageType,
-    const Sequence< OUString >& aCommandURLSequence,
+    const Sequence< OUString >& aActionURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
 throw ( css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
+    m_pImpl->replaceImages( nImageType, aActionURLSequence, aGraphicsSequence );
 }
 
-void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
+void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence )
 throw ( css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->removeImages(nImageType,aCommandURLSequence);
+    m_pImpl->removeImages( nImageType, aActionURLSequence );
 }
 
-void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aActionURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
 throw ( css::container::ElementExistException,
         css::lang::IllegalArgumentException,
         css::lang::IllegalAccessException,
         css::uno::RuntimeException, std::exception)
 {
-    m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
+    m_pImpl->insertImages( nImageType, aActionURLSequence, aGraphicSequence );
 }
 
 // XUIConfiguration
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 930c62c..ba532ae 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -176,7 +176,7 @@ void AddonsToolBarManager::RefreshImages()
 
         if ( nId > 0 )
         {
-            OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+            OUString aActionURL = m_pToolBar->GetItemCommand( nId );
             OUString aImageId;
             AddonsParams* pRuntimeItemData = static_cast<AddonsParams*>(m_pToolBar->GetItemData( nId ));
             if ( pRuntimeItemData )
@@ -184,7 +184,7 @@ void AddonsToolBarManager::RefreshImages()
 
             m_pToolBar->SetItemImage(
                 nId,
-                RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages )
+                RetrieveImage( m_xFrame, aImageId, aActionURL, bBigImages )
             );
         }
     }
@@ -226,13 +226,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
         OUString   aTitle;
         OUString   aImageId;
         OUString   aContext;
-        OUString   aTarget;
+        OUString   aRecipient;
         OUString   aControlType;
         sal_uInt16 nWidth( 0 );
 
         const Sequence< PropertyValue >& rSeq = rAddonToolbar[n];
 
-        ToolBarMerger::ConvertSequenceToValues( rSeq, aURL, aTitle, aImageId, aTarget, aContext, aControlType, nWidth );
+        ToolBarMerger::ConvertSequenceToValues( rSeq, aURL, aTitle, aImageId, aRecipient, aContext, aControlType, nWidth );
 
         if ( IsCorrectContext( aModuleIdentifier, aContext ))
         {
@@ -267,7 +267,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                 // Create TbRuntimeItemData to hold additional information we will need in the future
                 AddonsParams* pRuntimeItemData = new AddonsParams;
                 pRuntimeItemData->aImageId  = aImageId;
-                pRuntimeItemData->aTarget   = aTarget;
+                pRuntimeItemData->aRecipient = aRecipient;
                 pRuntimeItemData->nWidth    = nWidth;
                 m_pToolBar->SetItemData( nId, pRuntimeItemData );
                 m_pToolBar->SetItemCommand( nId, aURL );
@@ -276,7 +276,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
 
                 bool bMustBeInit( true );
 
-                // Support external toolbar controller for add-ons!
+                // Support external toolbar controller for add-ons
                 if ( m_xToolbarControllerFactory.is() &&
                      m_xToolbarControllerFactory->hasController( aURL, m_aModuleIdentifier ))
                 {
@@ -329,7 +329,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                     aPropValue.Name = "Frame";
                     aPropValue.Value <<= m_xFrame;
                     aArgs[0] <<= aPropValue;
-                    aPropValue.Name = "CommandURL";
+                    aPropValue.Name = "ActionURL";
                     aPropValue.Value <<= aURL;
                     aArgs[1] <<= aPropValue;
                     aPropValue.Name = "ServiceManager";
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index fef0d1d..13439e0 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -61,7 +61,7 @@ ButtonToolbarController::ButtonToolbarController(
     cppu::OWeakObject(),
     m_bInitialized( false ),
     m_bDisposed( false ),
-    m_aCommandURL( aCommand ),
+    m_aActionURL( aCommand ),
     m_xContext( rxContext ),
     m_pToolbar( pToolBar )
 {
@@ -126,9 +126,15 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
             if ( aArguments[i] >>= aPropValue )
             {
                 if ( aPropValue.Name == "Frame" )
-                    m_xFrame.set(aPropValue.Value,UNO_QUERY);
+                    m_xFrame.set( aPropValue.Value, UNO_QUERY );
+                else if ( aPropValue.Name == "ActionURL" )
+                    aPropValue.Value >>= m_aActionURL;
                 else if ( aPropValue.Name == "CommandURL" )
-                    aPropValue.Value >>= m_aCommandURL;
+                {
+                    SAL_WARN( "framework", "\"CommandURL\" to \"ActionURL\" in ButtonToolbarController::initialize" );
+                    aPropValue.Value >>= m_aActionURL;
+                    aPropValue.Name = "ActionURL";
+                }
                 else if ( aPropValue.Name == "ServiceManager" )
                 {
                     Reference<XMultiServiceFactory> xServiceManager(aPropValue.Value,UNO_QUERY);
@@ -212,8 +218,8 @@ throw (css::uno::RuntimeException, std::exception)
     uno::Reference< frame::XDispatch >      xDispatch;
     uno::Reference< frame::XFrame >         xFrame;
     uno::Reference< util::XURLTransformer > xURLTransformer;
-    OUString                           aCommandURL;
-    css::util::URL             aTargetURL;
+    OUString                           aActionURL;
+    css::util::URL             aRecipientURL;
 
     {
         SolarMutexGuard aSolarMutexGuard;
@@ -224,7 +230,7 @@ throw (css::uno::RuntimeException, std::exception)
         if ( m_bInitialized &&
              m_xFrame.is() &&
              m_xContext.is() &&
-             !m_aCommandURL.isEmpty() )
+             !m_aActionURL.isEmpty() )
         {
             if ( !m_xURLTransformer.is() )
             {
@@ -232,7 +238,7 @@ throw (css::uno::RuntimeException, std::exception)
             }
 
             xFrame          = m_xFrame;
-            aCommandURL     = m_aCommandURL;
+            aActionURL     = m_aActionURL;
             xURLTransformer = m_xURLTransformer;
         }
     }
@@ -240,9 +246,9 @@ throw (css::uno::RuntimeException, std::exception)
     uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, uno::UNO_QUERY );
     if ( xDispatchProvider.is() )
     {
-        aTargetURL.Complete = aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
-        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+        aRecipientURL.Complete = aActionURL;
+        xURLTransformer->parseStrict( aRecipientURL );
+        xDispatch = xDispatchProvider->queryDispatch( aRecipientURL, OUString(), 0 );
     }
 
     if ( xDispatch.is() )
@@ -255,7 +261,7 @@ throw (css::uno::RuntimeException, std::exception)
             aArgs[0].Name   = "KeyModifier";
             aArgs[0].Value  <<= KeyModifier;
 
-            xDispatch->dispatch( aTargetURL, aArgs );
+            xDispatch->dispatch( aRecipientURL, aArgs );
         }
         catch ( const DisposedException& )
         {
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index fc8003c..139265a 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -95,8 +95,8 @@ throw ( RuntimeException, std::exception )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
-    OUString                     aCommandURL;
-    css::util::URL  aTargetURL;
+    OUString                     aActionURL;
+    css::util::URL  aRecipientURL;
     Sequence<PropertyValue> aArgs;
 
     {
@@ -111,20 +111,20 @@ throw ( RuntimeException, std::exception )
         {
             xURLTransformer = m_xURLTransformer;
             xDispatch = getDispatchFromCommand( m_aCommandURL );
-            aCommandURL = m_aCommandURL;
-            aTargetURL = getInitializedURL();
+            aActionURL = m_aCommandURL;
+            aRecipientURL = getInitializedURL();
             aArgs = getExecuteArgs(KeyModifier);
         }
     }
 
-    if ( xDispatch.is() && !aTargetURL.Complete.isEmpty() )
+    if ( xDispatch.is() && !aRecipientURL.Complete.isEmpty() )
     {
         // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( LINK(nullptr, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo );
+        GoInfo* pGoInfo = new GoInfo;
+        pGoInfo->xDispatch     = xDispatch;
+        pGoInfo->aRecipientURL    = aRecipientURL;
+        pGoInfo->aArgs         = aArgs;
+        Application::PostUserEvent( LINK(nullptr, ComplexToolbarController , ExecuteHdl_Impl), pGoInfo );
     }
 }
 
@@ -198,20 +198,20 @@ throw ( RuntimeException, std::exception )
 
 IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, void*, p, void )
 {
-   ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
+   GoInfo* pGoInfo = static_cast<GoInfo*>(p);
    SolarMutexReleaser aReleaser;
    try
    {
-       // Asynchronous execution as this can lead to our own destruction!
-       // Framework can recycle our current frame and the layout manager disposes all user interface
-       // elements if a component gets detached from its frame!
-       pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
+       // Asynchronous execution as this can lead to destruction of self.
+       // Framework can recycle the current frame and the layout manager disposes all user interface
+       // elements if a component gets detached from its frame
+       pGoInfo->xDispatch->dispatch( pGoInfo->aRecipientURL, pGoInfo->aArgs );
    }
    catch ( const Exception& )
    {
    }
 
-   delete pExecuteInfo;
+   delete pGoInfo;
 }
 
 IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, void*, p, void )
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index a124f2e..b814ae1 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -413,22 +413,22 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeE
 
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
-        css::util::URL aTargetURL;
+        css::util::URL aRecipientURL;
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         fillPopupMenu( m_xPopupMenu );
         m_aURLToDispatchMap.free();
 
         for (const char* aCommand : aCommands)
         {
-            aTargetURL.Complete = OUString::createFromAscii( aCommand );
-            m_xURLTransformer->parseStrict( aTargetURL );
+            aRecipientURL.Complete = OUString::createFromAscii( aCommand );
+            m_xURLTransformer->parseStrict( aRecipientURL );
 
-            Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+            Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aRecipientURL, OUString(), 0 );
             if ( xDispatch.is() )
             {
-                xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-                xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-                m_aURLToDispatchMap.insert( UrlToDispatchMap::value_type( aTargetURL.Complete, xDispatch ));
+                xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aRecipientURL );
+                xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aRecipientURL );
+                m_aURLToDispatchMap.insert( UrlToDispatchMap::value_type( aRecipientURL.Complete, xDispatch ));
             }
         }
     }
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 8571165..d22ba90 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -188,11 +188,11 @@ void FontMenuController::impl_setPopupMenu()
 {
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
 
-    css::util::URL aTargetURL;
+    css::util::URL aURL;
     // Register for font list updates to get the current font list from the controller
-    aTargetURL.Complete = ".uno:FontNameList";
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = ".uno:FontNameList";
+    m_xURLTransformer->parseStrict( aURL );
+    m_xFontListDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 }
 
 void SAL_CALL FontMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
@@ -201,15 +201,15 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( css::uno::RuntimeExc
 
     osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xFontListDispatch );
-    css::util::URL aTargetURL;
-    aTargetURL.Complete = ".uno:FontNameList";
-    m_xURLTransformer->parseStrict( aTargetURL );
+    css::util::URL aURL;
+    aURL.Complete = ".uno:FontNameList";
+    m_xURLTransformer->parseStrict( aURL );
     aLock.clear();
 
     if ( xDispatch.is() )
     {
-        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aURL );
+        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aURL );
     }
 }
 
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 75f47e4..9017350 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -282,11 +282,11 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
 void FontSizeMenuController::impl_setPopupMenu()
 {
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-    css::util::URL aTargetURL;
+    css::util::URL aURL;
     // Register for font name updates which gives us info about the current font!
-    aTargetURL.Complete = ".uno:CharFontName";
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = ".uno:CharFontName";
+    m_xURLTransformer->parseStrict( aURL );
+    m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 }
 
 void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
@@ -296,15 +296,15 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( css::uno::Runtim
     throwIfDisposed();
 
     Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
-    css::util::URL aTargetURL;
-    aTargetURL.Complete = ".uno:CharFontName";
-    m_xURLTransformer->parseStrict( aTargetURL );
+    css::util::URL aURL;
+    aURL.Complete = ".uno:CharFontName";
+    m_xURLTransformer->parseStrict( aURL );
     aLock.clear();
 
     if ( xDispatch.is() )
     {
-        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aURL );
+        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aURL );
     }
 
     svt::PopupMenuControllerBase::updatePopupMenu();
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 21da2b0..35812c9 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -127,7 +127,7 @@ throw ( RuntimeException, std::exception )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
-    OUString                     aCommandURL;
+    OUString                     aActionURL;
 
     {
         SolarMutexGuard aSolarMutexGuard;
@@ -141,8 +141,8 @@ throw ( RuntimeException, std::exception )
         {
             xURLTransformer = URLTransformer::create(m_xContext);
 
-            aCommandURL = m_aCommandURL;
-            URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL );
+            aActionURL = m_aCommandURL;
+            URLToDispatchMap::iterator pIter = m_aListenerMap.find( aActionURL );
             if ( pIter != m_aListenerMap.end() )
                 xDispatch = pIter->second;
         }
@@ -150,22 +150,22 @@ throw ( RuntimeException, std::exception )
 
     if ( xDispatch.is() && xURLTransformer.is() )
     {
-        css::util::URL aTargetURL;
+        css::util::URL aURL;
         Sequence<PropertyValue>   aArgs( 1 );
 
         // Add key modifier to argument list
         aArgs[0].Name  = "KeyModifier";
         aArgs[0].Value <<= KeyModifier;
 
-        aTargetURL.Complete = aCommandURL;
-        xURLTransformer->parseStrict( aTargetURL );
+        aURL.Complete = aActionURL;
+        xURLTransformer->parseStrict( aURL );
 
         // Execute dispatch asynchronously
-        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-        pExecuteInfo->xDispatch     = xDispatch;
-        pExecuteInfo->aTargetURL    = aTargetURL;
-        pExecuteInfo->aArgs         = aArgs;
-        Application::PostUserEvent( LINK(nullptr, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
+        GoInfo* pGoInfo = new GoInfo;
+        pGoInfo->xDispatch     = xDispatch;
+        pGoInfo->aRecipientURL = aURL;
+        pGoInfo->aArgs         = aArgs;
+        Application::PostUserEvent( LINK(nullptr, GenericToolbarController , ExecuteHdl_Impl), pGoInfo );
     }
 }
 
@@ -265,20 +265,20 @@ throw ( RuntimeException, std::exception )
 
 IMPL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, p, void )
 {
-   ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
+   GoInfo* pGoInfo = static_cast<GoInfo*>(p);
    SolarMutexReleaser aReleaser;
    try
    {
         // Asynchronous execution as this can lead to our own destruction!
         // Framework can recycle our current frame and the layout manager disposes all user interface
         // elements if a component gets detached from its frame!
-        pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
+        pGoInfo->xDispatch->dispatch( pGoInfo->aRecipientURL, pGoInfo->aArgs );
    }
    catch ( const Exception& )
    {
    }
 
-   delete pExecuteInfo;
+   delete pGoInfo;
 }
 
 MenuToolbarController::MenuToolbarController( const Reference< XComponentContext >& rxContext,
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a9c2a22..cda7553 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -133,27 +133,27 @@ void LanguageSelectionMenuController::impl_setPopupMenu()
 {
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
 
-    css::util::URL aTargetURL;
+    css::util::URL aURL;
 
     // Register for language updates
-    aTargetURL.Complete = m_aLangStatusCommandURL;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = m_aLangStatusActionURL;
+    m_xURLTransformer->parseStrict( aURL );
+    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 
     // Register for setting languages and opening language dialog
-    aTargetURL.Complete = m_aMenuCommandURL_Lang;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = m_aMenuActionURL_Lang;
+    m_xURLTransformer->parseStrict( aURL );
+    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 
     // Register for opening character dialog
-    aTargetURL.Complete = m_aMenuCommandURL_Font;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = m_aMenuActionURL_Font;
+    m_xURLTransformer->parseStrict( aURL );
+    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 
     // Register for opening character dialog with preselected paragraph
-    aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+    aURL.Complete = m_aMenuActionURL_CharDlgForParagraph;
+    m_xURLTransformer->parseStrict( aURL );
+    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 }
 
 void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
@@ -247,15 +247,15 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::un
     // Force status update to get information about the current languages
     osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xLanguageDispatch );
-    css::util::URL aTargetURL;
-    aTargetURL.Complete = m_aLangStatusCommandURL;
-    m_xURLTransformer->parseStrict( aTargetURL );
+    css::util::URL aURL;
+    aURL.Complete = m_aLangStatusActionURL;
+    m_xURLTransformer->parseStrict( aURL );
     aLock.clear();
 
     if ( xDispatch.is() )
     {
-        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+        xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aURL );
+        xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aURL );
     }
 
     // TODO: Fill menu with the information retrieved by the status update
@@ -286,10 +286,10 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >
 
         if ( m_bInitialized )
         {
-            m_aLangStatusCommandURL               = ".uno:LanguageStatus";
-            m_aMenuCommandURL_Lang                = m_aLangStatusCommandURL;
-            m_aMenuCommandURL_Font                = ".uno:FontDialog";
-            m_aMenuCommandURL_CharDlgForParagraph = ".uno:FontDialogForParagraph";
+            m_aLangStatusActionURL               = ".uno:LanguageStatus";
+            m_aMenuActionURL_Lang                = m_aLangStatusActionURL;
+            m_aMenuActionURL_Font                = ".uno:FontDialog";
+            m_aMenuActionURL_CharDlgForParagraph = ".uno:FontDialogForParagraph";
         }
     }
 }
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index feb5e71..e4a65f4 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -536,12 +536,12 @@ void MenuBarManager::RemoveListener()
             MenuItemHandler* pItemHandler = *p;
             if ( pItemHandler->xMenuItemDispatch.is() )
             {
-                URL aTargetURL;
-                aTargetURL.Complete = pItemHandler->aMenuItemURL;
-                m_xURLTransformer->parseStrict( aTargetURL );
+                URL aURL;
+                aURL.Complete = pItemHandler->aMenuItemURL;
+                m_xURLTransformer->parseStrict( aURL );
 
                 pItemHandler->xMenuItemDispatch->removeStatusListener(
-                    static_cast< XStatusListener* >( this ), aTargetURL );
+                    static_cast< XStatusListener* >( this ), aURL );
             }
 
             pItemHandler->xMenuItemDispatch.clear();
@@ -624,17 +624,17 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
     if ( pMenuItemDisposing )
     {
         // Release references to the dispatch object
-        URL aTargetURL;
-        aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL;
+        URL aURL;
+        aURL.Complete = pMenuItemDisposing->aMenuItemURL;
 
         // Check reference of service manager before we use it. Reference could
         // be cleared due to RemoveListener call!
         if ( m_xContext.is() )
         {
-            m_xURLTransformer->parseStrict( aTargetURL );
+            m_xURLTransformer->parseStrict( aURL );
 
             pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(
-                static_cast< XStatusListener* >( this ), aTargetURL );
+                static_cast< XStatusListener* >( this ), aURL );
             pMenuItemDisposing->xMenuItemDispatch.clear();
             if ( pMenuItemDisposing->xPopupMenu.is() )
             {
@@ -820,7 +820,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
             }
         }
 
-        URL aTargetURL;
+        URL aURL;
 
         // Use provided dispatch provider => fallback to frame as dispatch provider
         Reference< XDispatchProvider > xDispatchProvider;
@@ -850,20 +850,20 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
                         {
                             Reference< XDispatch > xMenuItemDispatch;
 
-                            aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
+                            aURL.Complete = pMenuItemHandler->aMenuItemURL;
 
-                            m_xURLTransformer->parseStrict( aTargetURL );
+                            m_xURLTransformer->parseStrict( aURL );
 
                             if ( bHasDisabledEntries )
                             {
-                                if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aTargetURL.Path ))
+                                if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aURL.Path ))
                                     pMenu->HideItem( pMenuItemHandler->nItemId );
                             }
 
                             if ( m_bIsBookmarkMenu )
-                                xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, pMenuItemHandler->aTargetFrame, 0 );
+                                xMenuItemDispatch = xDispatchProvider->queryDispatch( aURL, pMenuItemHandler->aFrame, 0 );
                             else
-                                xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+                                xMenuItemDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
 
                             bool bPopupMenu( false );
                             if ( !pMenuItemHandler->xPopupMenuController.is() &&
@@ -885,14 +885,14 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
                             if ( xMenuItemDispatch.is() )
                             {
                                 pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
-                                pMenuItemHandler->aMenuItemURL      = aTargetURL.Complete;
+                                pMenuItemHandler->aMenuItemURL      = aURL.Complete;
 
                                 if ( !bPopupMenu )
                                 {
-                                    xMenuItemDispatch->addStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
-                                    // For the menubar, we have to keep status listening to support Ubuntu's HUD.
+                                    xMenuItemDispatch->addStatusListener( static_cast< XStatusListener* >( this ), aURL );
+                                    // for the menubar keep listening to support exempli gratia Ubuntu's HUD
                                     if ( !m_bHasMenuBar )
-                                        xMenuItemDispatch->removeStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
+                                        xMenuItemDispatch->removeStatusListener( static_cast< XStatusListener* >( this ), aURL );
                                 }
                             }
                             else if ( !bPopupMenu )
@@ -910,13 +910,13 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
                         // We need an update to reflect the current state
                         try
                         {
-                            aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-                            m_xURLTransformer->parseStrict( aTargetURL );
+                            aURL.Complete = pMenuItemHandler->aMenuItemURL;
+                            m_xURLTransformer->parseStrict( aURL );
 
                             pMenuItemHandler->xMenuItemDispatch->addStatusListener(
-                                                                    static_cast< XStatusListener* >( this ), aTargetURL );
+                                                                    static_cast< XStatusListener* >( this ), aURL );
                             pMenuItemHandler->xMenuItemDispatch->removeStatusListener(
-                                                                    static_cast< XStatusListener* >( this ), aTargetURL );
+                                                                    static_cast< XStatusListener* >( this ), aURL );
                         }
                         catch ( const Exception& )
                         {
@@ -967,7 +967,7 @@ IMPL_LINK_NOARG( MenuBarManager, AsyncSettingsHdl, Timer*, void)
 
 IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool )
 {
-    URL                     aTargetURL;
+    URL                     aURL;
     Sequence<PropertyValue> aArgs;
     Reference< XDispatch >  xDispatch;
 
@@ -1009,8 +1009,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool )
                 MenuItemHandler* pMenuItemHandler = GetMenuItemHandler( nCurItemId );
                 if ( pMenuItemHandler && pMenuItemHandler->xMenuItemDispatch.is() )
                 {
-                    aTargetURL.Complete = pMenuItemHandler->aMenuItemURL;
-                    m_xURLTransformer->parseStrict( aTargetURL );
+                    aURL.Complete = pMenuItemHandler->aMenuItemURL;
+                    m_xURLTransformer->parseStrict( aURL );
 
                     if ( m_bIsBookmarkMenu )
                     {
@@ -1029,7 +1029,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool )
     if ( xDispatch.is() )
     {
         SolarMutexReleaser aReleaser;
-        xDispatch->dispatch( aTargetURL, aArgs );
+        xDispatch->dispatch( aURL, aArgs );
     }
 
     if ( !m_bHasMenuBar )
@@ -1044,7 +1044,7 @@ bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLT
 {
     if ( pPopupMenu )
     {
-        URL               aTargetURL;
+        URL               aURL;
         SvtCommandOptions aCmdOptions;
 
         sal_uInt16 nCount = pPopupMenu->GetItemCount();
@@ -1066,10 +1066,10 @@ bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLT
                 }
                 else
                 {
-                    aTargetURL.Complete = pPopupMenu->GetItemCommand( nId );
-                    rTransformer->parseStrict( aTargetURL );
+                    aURL.Complete = pPopupMenu->GetItemCommand( nId );
+                    rTransformer->parseStrict( aURL );
 
-                    if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aTargetURL.Path ))
+                    if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aURL.Path ))
                         ++nHideCount;
                 }
             }
@@ -1613,7 +1613,7 @@ void MenuBarManager::FillMenu(
      for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
         Sequence< PropertyValue >       aProp;
-        OUString                   aCommandURL;
+        OUString                   aActionURL;
         OUString                   aLabel;
         OUString                   aHelpURL;
         OUString                   aModuleIdentifier( rModuleIdentifier );
@@ -1631,8 +1631,14 @@ void MenuBarManager::FillMenu(
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
                     OUString aPropName = aProp[i].Name;
-                    if ( aPropName == "CommandURL" )
-                        aProp[i].Value >>= aCommandURL;
+                    if ( aPropName == "ActionURL" )
+                        aProp[i].Value >>= aActionURL;
+                    else if ( aPropName == "CommandURL" )
+                    {
+                        SAL_WARN( "framework", "\"CommandURL\" to \"ActionURL\" in MenuBarManager::FillMenu" );
+                        aProp[i].Value >>= aActionURL;
+                        aProp[i].Name = "ActionURL";
+                    }
                     else if ( aPropName == "HelpURL" )
                         aProp[i].Value >>= aHelpURL;
                     else if ( aPropName == "ItemDescriptorContainer" )
@@ -1656,7 +1662,7 @@ void MenuBarManager::FillMenu(
                 if ( nType == css::ui::ItemType::DEFAULT )
                 {
                     pMenu->InsertItem( nId, aLabel );
-                    pMenu->SetItemCommand( nId, aCommandURL );
+                    pMenu->SetItemCommand( nId, aActionURL );
 
                     if ( nStyle )
                     {
@@ -1946,7 +1952,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo
                 if ( pAddonAttributes )
                 {
                     // read additional attributes from attributes struct and AddonMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pAddonAttributes->aTargetFrame;
+                    pMenuItemHandler->aFrame = pAddonAttributes->aFrame;
                 }
 
                 pMenuItemHandler->aMenuItemURL = aItemCommand;
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 8adb19f..03e860b 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -396,8 +396,14 @@ void MenuBarMerger::GetMenuEntry(
             rAddonMenuEntry[i].Value >>= rAddonMenuItem.aURL;
         else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TITLE )
             rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTitle;
-        else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TARGET )
-            rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTarget;
+        else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_RECIPIENT )
+            rAddonMenuEntry[i].Value >>= rAddonMenuItem.aRecipient;
+        else if ( aMenuEntryPropName == "Target" )
+        {
+            SAL_WARN( "framework", "\"Target\" into \"Recipient\" in MenuBarMerger" );
+            rAddonMenuEntry[i].Value >>= rAddonMenuItem.aRecipient;
+            ///rAddonMenuEntry[i].Name = OUString::createFromAscii( ADDONSMENUITEM_STRING_RECIPIENT );
+        }
         else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_SUBMENU )
         {
             uno::Sequence< uno::Sequence< beans::PropertyValue > > aSubMenu;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 94b15fc..aa5d01d 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -307,7 +307,7 @@ NewMenuController::NewMenuController( const css::uno::Reference< css::uno::XComp
     m_bNewMenu( false ),
     m_bModuleIdentified( false ),
     m_bAcceleratorCfg( false ),
-    m_aTargetFrame( "_default" ),
+    m_aFrame( "_default" ),
     m_xContext( xContext )
 {
 }
@@ -331,10 +331,10 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
     if ( pVCLPopupMenu )
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-        URL aTargetURL;
-        aTargetURL.Complete = rtl::OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
-        m_xURLTransformer->parseStrict( aTargetURL );
-        Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+        URL theURL;
+        theURL.Complete = rtl::OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
+        m_xURLTransformer->parseStrict( theURL );
+        Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch( theURL, OUString(), 0 );
         if(xMenuItemDispatch == nullptr)
             return;
 
@@ -343,7 +343,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
 
         OUString aTitle;
         OUString aURL;
-        OUString aTargetFrame;
+        OUString aRecipientFrame;
         OUString aImageId;
         sal_uInt16 nItemId = 1;
 
@@ -358,7 +358,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
                 else if ( aProperty.Name == DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER )
                     aProperty.Value >>= aImageId;
                 else if ( aProperty.Name == DYNAMICMENU_PROPERTYNAME_TARGETNAME )
-                    aProperty.Value >>= aTargetFrame;
+                    aProperty.Value >>= aRecipientFrame;
             }
 
             if ( aTitle.isEmpty() && aURL.isEmpty() )
@@ -371,7 +371,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
                 pVCLPopupMenu->InsertItem( nItemId, aTitle );
                 pVCLPopupMenu->SetItemCommand( nItemId, aURL );
 
-                sal_uIntPtr nAttributePtr = MenuAttributes::CreateAttribute( aTargetFrame, aImageId );
+                sal_uIntPtr nAttributePtr = MenuAttributes::CreateAttribute( aRecipientFrame, aImageId );
                 pVCLPopupMenu->SetUserValue( nItemId, nAttributePtr, MenuAttributes::ReleaseAttribute );
 
                 nItemId++;
@@ -419,7 +419,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
     xURLTransformer     = m_xURLTransformer;
     aLock.clear();
 
-    css::util::URL aTargetURL;
+    css::util::URL aURL;
     Sequence< PropertyValue > aArgsList( 1 );
 
     if ( xPopupMenu.is() && xDispatchProvider.is() )
@@ -427,24 +427,24 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
         VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXPopupMenu::GetImplementation( xPopupMenu ));
         if ( pPopupMenu )
         {
-            OUString aTargetFrame( m_aTargetFrame );
+            OUString aRecipientFrame( m_aFrame );
 
             {
                 SolarMutexGuard aSolarMutexGuard;
                 PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu());
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand(rEvent.MenuId);
+                aURL.Complete = pVCLPopupMenu->GetItemCommand(rEvent.MenuId);
                 sal_uLong nAttributePtr = pVCLPopupMenu->GetUserValue(rEvent.MenuId);
                 MenuAttributes* pAttributes = reinterpret_cast<MenuAttributes *>(nAttributePtr);
                 if (pAttributes)
-                    aTargetFrame = pAttributes->aTargetFrame;
+                    aRecipientFrame = pAttributes->aFrame;
             }
 
-            xURLTransformer->parseStrict( aTargetURL );
+            xURLTransformer->parseStrict( aURL );
 
             aArgsList[0].Name = "Referer";
             aArgsList[0].Value = makeAny( OUString( "private:user" ));
 
-            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, aTargetFrame, 0 );
+            xDispatch = xDispatchProvider->queryDispatch( aURL, aRecipientFrame, 0 );
         }
     }
 
@@ -455,7 +455,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
         // after select!!!
         NewDocument* pNewDocument = new NewDocument;
         pNewDocument->xDispatch  = xDispatch;
-        pNewDocument->aTargetURL = aTargetURL;
+        pNewDocument->aRecipientURL = aURL;
         pNewDocument->aArgSeq    = aArgsList;
         Application::PostUserEvent( LINK(nullptr, NewMenuController, ExecuteHdl_Impl), pNewDocument );
     }
@@ -559,7 +559,7 @@ IMPL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, void*, p, void )
         // Asynchronous execution as this can lead to our own destruction!
         // Framework can recycle our current frame and the layout manager disposes all user interface
         // elements if a component gets detached from its frame!
-        pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq );
+        pNewDocument->xDispatch->dispatch( pNewDocument->aRecipientURL, pNewDocument->aArgSeq );
     delete pNewDocument;
 }
 
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index e23f64c..6b25d59 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -609,7 +609,7 @@ throw ( css::uno::RuntimeException, std::exception )
     if ( !m_aLastURL.getLength() )
         return;
 
-    OUString aTarget( "_default" );
+    OUString aRecipient( "_default" );
     if ( m_xPopupMenu.is() )
     {
         // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
@@ -626,14 +626,14 @@ throw ( css::uno::RuntimeException, std::exception )
                 pVCLPopupMenu->GetUserValue( pVCLPopupMenu->GetCurItemId() ) );
 
         if ( pMenuAttributes )
-            aTarget = pMenuAttributes->aTargetFrame;
+            aRecipient = pMenuAttributes->aFrame;
     }
 
     css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
     aArgs[0].Name = "Referer";
     aArgs[0].Value <<= OUString( "private:user" );
 
-    dispatchCommand( m_aLastURL, aArgs, aTarget );
+    dispatchCommand( m_aLastURL, aArgs, aRecipient );
 }
 
 void NewToolbarController::functionExecuted( const OUString &rCommand )
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 786ef69..c24a41d 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -49,7 +49,7 @@ static const char MENU_SHORTCUT[]     = "~N. ";
 
 struct LoadRecentFile
 {
-    util::URL                               aTargetURL;
+    util::URL                               aURL;
     uno::Sequence< beans::PropertyValue >   aArgSeq;
     uno::Reference< frame::XDispatch >      xDispatch;
 };
@@ -91,7 +91,7 @@ public:
     virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
 
     // XDispatchProvider
-    virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sRecipient, sal_Int32 nOptions ) throw( uno::RuntimeException, std::exception ) override;
 
     // XDispatch
     virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ) override;
@@ -271,7 +271,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
 {
     Reference< XDispatch >            xDispatch;
     Reference< XDispatchProvider >    xDispatchProvider;
-    css::util::URL                    aTargetURL;
+    css::util::URL                    aURL;
     Sequence< PropertyValue >         aArgsList;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
@@ -283,8 +283,8 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
     {
         const RecentFile& rRecentFile = m_aRecentFilesItems[ nIndex ];
 
-        aTargetURL.Complete = rRecentFile.aURL;
-        m_xURLTransformer->parseStrict( aTargetURL );
+        aURL.Complete = rRecentFile.aURL;
+        m_xURLTransformer->parseStrict( aURL );
 
         sal_Int32 nSize = 2;
         aArgsList.realloc( nSize );
@@ -303,7 +303,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
             aArgsList[nSize-1].Value <<= m_aModuleName;
         }
 
-        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, "_default", 0 );
+        xDispatch = xDispatchProvider->queryDispatch( aURL, "_default", 0 );
     }
 
     if ( xDispatch.is() )
@@ -313,7 +313,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         // after select!!!
         LoadRecentFile* pLoadRecentFile = new LoadRecentFile;
         pLoadRecentFile->xDispatch  = xDispatch;
-        pLoadRecentFile->aTargetURL = aTargetURL;
+        pLoadRecentFile->aURL = aURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
 
         Application::PostUserEvent( LINK(nullptr, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
@@ -388,8 +388,8 @@ void RecentFilesMenuController::impl_setPopupMenu()
 // XDispatchProvider
 Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
     const URL& aURL,
-    const OUString& /*sTarget*/,
-    sal_Int32 /*nFlags*/ )
+    const OUString& /*sRecipient*/,
+    sal_Int32 /*nOptions*/ )
 throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aLock( m_aMutex );
@@ -446,7 +446,7 @@ IMPL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, void*, p, void )
         // Asynchronous execution as this can lead to our own destruction!
         // Framework can recycle our current frame and the layout manager disposes all user interface
         // elements if a component gets detached from its frame!
-        pLoadRecentFile->xDispatch->dispatch( pLoadRecentFile->aTargetURL, pLoadRecentFile->aArgSeq );
+        pLoadRecentFile->xDispatch->dispatch( pLoadRecentFile->aURL, pLoadRecentFile->aArgSeq );
     }
     catch ( const Exception& )
     {
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 02011c7..414d4e4 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -272,7 +272,7 @@ void ResourceMenuController::fillToolbarData()
         {
             if ( m_xMenuContainer->getByIndex( i ) >>= aPropSequence )
             {
-                OUString aCommandURL;
+                OUString aActionURL;
                 OUString aLabel;
                 sal_uInt16 nType = css::ui::ItemType::DEFAULT;
                 bool bVisible = true;
@@ -280,7 +280,14 @@ void ResourceMenuController::fillToolbarData()
                 for ( const auto& aProp: aPropSequence )
                 {
                     if ( aProp.Name == "CommandURL" )
-                        aProp.Value >>= aCommandURL;
+                    {
+                        SAL_WARN( "framework", "\"CommandURL\" to \"ActionURL\" in fillToolbarData()" );
+                        aProp.Value >>= aActionURL;
+                        ///aProp.Name = "ActionURL";
+                    }
+
+                    if ( aProp.Name == "ActionURL" )
+                        aProp.Value >>= aActionURL;
                     else if ( aProp.Name == "Label" )
                         aProp.Value >>= aLabel;
                     else if ( aProp.Name == "Type" )
@@ -295,7 +302,7 @@ void ResourceMenuController::fillToolbarData()
                     if ( bVisible )
                     {
                         pVCLMenu->InsertItem( m_nNewMenuId, aLabel );
-                        pVCLMenu->SetItemCommand( m_nNewMenuId++, aCommandURL );
+                        pVCLMenu->SetItemCommand( m_nNewMenuId++, aActionURL );
                     }
                     break;
                 case css::ui::ItemType::SEPARATOR_LINE:
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index fce91ae..15501f0 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -55,7 +55,7 @@
 using namespace ::com::sun::star;
 
 // Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
+static const char ITEM_DESCRIPTOR_ACTIONURL[]   = "ActionURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
 static const char ITEM_DESCRIPTOR_OFFSET[]      = "Offset";
 static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
@@ -308,19 +308,19 @@ void StatusBarManager::CreateControllers()
         if ( nId == 0 )
             continue;
 
-        OUString aCommandURL( m_pStatusBar->GetItemCommand( nId ));
+        OUString aActionURL( m_pStatusBar->GetItemCommand( nId ));
         bool bInit( true );
         uno::Reference< frame::XStatusbarController > xController;
         AddonStatusbarItemData *pItemData = static_cast< AddonStatusbarItemData *>( m_pStatusBar->GetItemData( nId ) );
         uno::Reference< ui::XStatusbarItem > xStatusbarItem(
-            static_cast< cppu::OWeakObject *>( new StatusbarItem( m_pStatusBar, pItemData, nId, aCommandURL ) ),
+            static_cast< cppu::OWeakObject *>( new StatusbarItem( m_pStatusBar, pItemData, nId, aActionURL ) ),
             uno::UNO_QUERY );
 
         beans::PropertyValue aPropValue;
         std::vector< uno::Any > aPropVector;
 
-        aPropValue.Name     = "CommandURL";
-        aPropValue.Value    <<= aCommandURL;
+        aPropValue.Name     = "ActionURL";
+        aPropValue.Value    <<= aActionURL;
         aPropVector.push_back( uno::makeAny( aPropValue ) );
 
         aPropValue.Name     = "ModuleIdentifier";
@@ -353,10 +353,10 @@ void StatusBarManager::CreateControllers()
 
         // 1) UNO Statusbar controllers, registered in Controllers.xcu
         if ( m_xStatusbarControllerFactory.is() &&
-             m_xStatusbarControllerFactory->hasController( aCommandURL, m_aModuleIdentifier ))
+             m_xStatusbarControllerFactory->hasController( aActionURL, m_aModuleIdentifier ))
         {
             xController.set(m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext(
-                                aCommandURL, aArgs, m_xContext ),
+                                aActionURL, aArgs, m_xContext ),
                             uno::UNO_QUERY );
             bInit = false; // Initialization is done through the factory service
         }
@@ -366,7 +366,7 @@ void StatusBarManager::CreateControllers()
             svt::StatusbarController* pController( nullptr );
 
             // 2) Old SFX2 Statusbar controllers
-            pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aCommandURL );
+            pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aActionURL );
             if ( !pController )
             {
                 // 3) Is Add-on? Generic statusbar controller
@@ -380,7 +380,7 @@ void StatusBarManager::CreateControllers()
                 else
                 {
                     // 4) Default Statusbar controller
-                    pController = new svt::StatusbarController( m_xContext, m_xFrame, aCommandURL, nId );
+                    pController = new svt::StatusbarController( m_xContext, m_xFrame, aActionURL, nId );
                 }
             }
 
@@ -427,7 +427,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
         uno::Sequence< beans::PropertyValue >   aProp;
-        OUString                                aCommandURL;
+        OUString                                aActionURL;
         OUString                                aHelpURL;
         sal_Int16                               nOffset( 0 );
         sal_Int16                               nStyle( 0 );
@@ -440,9 +440,15 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
             {
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
+                    if ( aProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL )
                     {
-                        aProp[i].Value >>= aCommandURL;
+                        aProp[i].Value >>= aActionURL;
+                    }
+                    else if ( aProp[i].Name == "CommandURL" )
+                    {
+                        SAL_WARN( "framework", "\"CommandURL\" to \"ActionURL\" in FillStatusBar" );
+                        aProp[i].Value >>= aActionURL;
+                        aProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL;
                     }
                     else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
                     {
@@ -466,13 +472,13 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
                     }
                 }
 
-                if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() )
+                if (( nType == css::ui::ItemType::DEFAULT ) && !aActionURL.isEmpty() )
                 {
-                    OUString aString( vcl::CommandInfoProvider::Instance().GetLabelForCommand(aCommandURL, m_xFrame));
+                    OUString aString( vcl::CommandInfoProvider::Instance().GetLabelForCommand( aActionURL, m_xFrame ));
                     StatusBarItemBits nItemBits( impl_convertItemStyleToItemBits( nStyle ));
 
                     m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset );
-                    m_pStatusBar->SetItemCommand( nId, aCommandURL );
+                    m_pStatusBar->SetItemCommand( nId, aActionURL );
                     m_pStatusBar->SetAccessibleName( nId, aString );
                     ++nId;
                 }
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index 9459acc..53b19d6 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -59,7 +59,7 @@ void lcl_ConvertSequenceToValues(
     {
         aPropVal = rSequence[i];
         if ( aPropVal.Name == MERGE_STATUSBAR_URL )
-            aPropVal.Value >>= rItem.aCommandURL;
+            aPropVal.Value >>= rItem.aActionURL;
         else if ( aPropVal.Name == MERGE_STATUSBAR_TITLE )
             aPropVal.Value >>= rItem.aLabel;
         else if ( aPropVal.Name == MERGE_STATUSBAR_CONTEXT )
@@ -103,7 +103,7 @@ void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
                             rAddonItem.nItemBits,
                             STATUSBAR_OFFSET,
                             nPos );
-    pStatusbar->SetItemCommand( nItemId, rAddonItem.aCommandURL );
+    pStatusbar->SetItemCommand( nItemId, rAddonItem.aActionURL );
     pStatusbar->SetQuickHelpText( nItemId, rAddonItem.aLabel );
     pStatusbar->SetAccessibleName( nItemId, rAddonItem.aLabel );
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 7942d94..27a0bae 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -80,7 +80,7 @@ using namespace ::com::sun::star;
 namespace framework
 {
 
-static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
+static const char ITEM_DESCRIPTOR_ACTIONURL[]  = "ActionURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]    = "HelpURL";
 static const char ITEM_DESCRIPTOR_CONTAINER[]  = "ItemDescriptorContainer";
 static const char ITEM_DESCRIPTOR_LABEL[]      = "Label";
@@ -289,12 +289,12 @@ void ToolBarManager::RefreshImages()
         }
         else
         {
-            OUString aCommandURL = m_pToolBar->GetItemCommand( it.first );
-            Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aCommandURL, bBigImages, m_xFrame);
+            OUString aActionURL = m_pToolBar->GetItemCommand( it.first );
+            Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( aActionURL, bBigImages, m_xFrame );
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages );
+                aImage = framework::AddonsOptions().GetImageFromURL( aActionURL, bBigImages );
             m_pToolBar->SetItemImage( it.first, aImage );
         }
     }
@@ -656,15 +656,15 @@ void ToolBarManager::CreateControllers()
 
         svt::ToolboxController* pController( nullptr );
 
-        OUString aCommandURL( m_pToolBar->GetItemCommand( nId ) );
+        OUString aActionURL( m_pToolBar->GetItemCommand( nId ) );
         // Command can be just an alias to another command.
-        OUString aRealCommandURL( vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aCommandURL, m_xFrame ) );
-        if ( !aRealCommandURL.isEmpty() )
-            aCommandURL = aRealCommandURL;
+        OUString aRealActionURL( vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aActionURL, m_xFrame ) );
+        if ( !aRealActionURL.isEmpty() )
+            aActionURL = aRealActionURL;
 
         if ( bHasDisabledEntries )
         {
-            aURL.Complete = aCommandURL;
+            aURL.Complete = aActionURL;
             m_xURLTransformer->parseStrict( aURL );
             if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aURL.Path ))
             {
@@ -675,7 +675,7 @@ void ToolBarManager::CreateControllers()
         }
 
         if ( m_xToolbarControllerFactory.is() &&
-             m_xToolbarControllerFactory->hasController( aCommandURL, m_aModuleIdentifier ))
+             m_xToolbarControllerFactory->hasController( aActionURL, m_aModuleIdentifier ))
         {
             PropertyValue aPropValue;
             std::vector< Any > aPropertyVector;
@@ -698,17 +698,17 @@ void ToolBarManager::CreateControllers()
             aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
             Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
-            xController.set( m_xToolbarControllerFactory->createInstanceWithArgumentsAndContext( aCommandURL, aArgs, m_xContext ),
+            xController.set( m_xToolbarControllerFactory->createInstanceWithArgumentsAndContext( aActionURL, aArgs, m_xContext ),
                              UNO_QUERY );
             bInit = false; // Initialization is done through the factory service
         }
 
-        if (( aCommandURL == aLoadURL ) && ( !m_pToolBar->IsItemVisible(nId)))
+        if (( aActionURL == aLoadURL ) && ( !m_pToolBar->IsItemVisible(nId)))
             bCreate = false;
 
         if ( !xController.is() && bCreate )
         {
-            pController = CreateToolBoxController( m_xFrame, m_pToolBar, nId, aCommandURL );
+            pController = CreateToolBoxController( m_xFrame, m_pToolBar, nId, aActionURL );
             if ( !pController )
             {
                 if ( m_pToolBar->GetItemData( nId ) != nullptr )
@@ -721,7 +721,7 @@ void ToolBarManager::CreateControllers()
                         ToolBarMerger::CreateController( m_xContext,
                                                          m_xFrame,
                                                          m_pToolBar,
-                                                         aCommandURL,
+                                                         aActionURL,
                                                          nId,
                                                          nWidth,
                                                          aControlType ), UNO_QUERY );
@@ -734,16 +734,16 @@ void ToolBarManager::CreateControllers()
                     if ( it == m_aMenuMap.end() )
                     {
                         xController.set(
-                            new GenericToolbarController( m_xContext, m_xFrame, m_pToolBar, nId, aCommandURL ));
+                            new GenericToolbarController( m_xContext, m_xFrame, m_pToolBar, nId, aActionURL ));
 
                         // Accessibility support: Set toggle button role for specific commands
-                        sal_Int32 nProps = vcl::CommandInfoProvider::Instance().GetPropertiesForCommand(aCommandURL, m_xFrame);
+                        sal_Int32 nProps = vcl::CommandInfoProvider::Instance().GetPropertiesForCommand( aActionURL, m_xFrame );
                         if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON )
                             m_pToolBar->SetItemBits( nId, m_pToolBar->GetItemBits( nId ) | ToolBoxItemBits::CHECKABLE );
                     }
                     else
                         xController.set(
-                            new MenuToolbarController( m_xContext, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
+                            new MenuToolbarController( m_xContext, m_xFrame, m_pToolBar, nId, aActionURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
                 }
             }
             else if ( pController )
@@ -789,8 +789,8 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Name = "Frame";
                 aPropValue.Value <<= m_xFrame;
                 aPropertyVector.push_back( makeAny( aPropValue ));
-                aPropValue.Name = "CommandURL";
-                aPropValue.Value <<= aCommandURL;
+                aPropValue.Name = "ActionURL";
+                aPropValue.Value <<= aActionURL;
                 aPropertyVector.push_back( makeAny( aPropValue ));
                 aPropValue.Name = "ServiceManager";
                 Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW);
@@ -811,12 +811,12 @@ void ToolBarManager::CreateControllers()
 
                 if (pController)
                 {
-                    if(aCommandURL == ".uno:SwitchXFormsDesignMode" ||
-                       aCommandURL == ".uno:ViewDataSourceBrowser" ||
-                       aCommandURL == ".uno:ParaLeftToRight" ||
-                       aCommandURL == ".uno:ParaRightToLeft"
-                       )
-                        pController->setFastPropertyValue_NoBroadcast(1, makeAny(true));
+                    if( aActionURL == ".uno:SwitchXFormsDesignMode" ||
+                        aActionURL == ".uno:ViewDataSourceBrowser" ||
+                        aActionURL == ".uno:ParaLeftToRight" ||
+                        aActionURL == ".uno:ParaRightToLeft"
+                      )
+                        pController->setFastPropertyValue_NoBroadcast( 1, makeAny(true) );
                 }
             }
 
@@ -961,7 +961,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
         Sequence< PropertyValue >   aProp;
-        OUString                    aCommandURL;
+        OUString                    aActionURL;
         OUString                    aLabel;
         OUString                    aHelpURL;
         sal_uInt16                  nType( css::ui::ItemType::DEFAULT );
@@ -975,21 +975,23 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                 bool bIsVisible( true );
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
+                    if ( aProp[i].Name == ITEM_DESCRIPTOR_ACTIONURL )
                     {
-                        aProp[i].Value >>= aCommandURL;
-                        if ( aCommandURL.startsWith(MENUPREFIX) )
+                        aProp[i].Value >>= aActionURL;
+                        if ( aActionURL.startsWith(MENUPREFIX) )
                         {
                             try
                             {
                                 Reference< XIndexAccess > xMenuContainer;
                                 if ( m_xDocUICfgMgr.is() &&
-                                     m_xDocUICfgMgr->hasSettings( aCommandURL ) )
-                                    xMenuContainer  = m_xDocUICfgMgr->getSettings( aCommandURL, false );
+                                     m_xDocUICfgMgr->hasSettings( aActionURL ) )
+                                    xMenuContainer  = m_xDocUICfgMgr->getSettings( aActionURL, false );
+
                                 if ( !xMenuContainer.is() &&
                                      m_xUICfgMgr.is() &&
-                                     m_xUICfgMgr->hasSettings( aCommandURL ) )
-                                    xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, false );
+                                     m_xUICfgMgr->hasSettings( aActionURL ) )
+                                    xMenuContainer = m_xUICfgMgr->getSettings( aActionURL, false );
+
                                 if ( xMenuContainer.is() && xMenuContainer->getCount() )
                                 {
                                     Sequence< PropertyValue > aProps;
@@ -1025,9 +1027,9 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                         aProp[i].Value >>= nStyle;
                 }
 
-                if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() )
+                if (( nType == css::ui::ItemType::DEFAULT ) && !aActionURL.isEmpty() )
                 {
-                    OUString aString(vcl::CommandInfoProvider::Instance().GetLabelForCommand(aCommandURL, m_xFrame));
+                    OUString aString(vcl::CommandInfoProvider::Instance().GetLabelForCommand( aActionURL, m_xFrame ));
 
                     ToolBoxItemBits nItemBits = ConvertStyleToToolboxItemBits( nStyle );
                     if ( aMenuDesc.is() )
@@ -1036,8 +1038,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                         nItemBits |= ToolBoxItemBits::DROPDOWNONLY;
                     }
                     m_pToolBar->InsertItem( nId, aString, nItemBits );
-                    m_pToolBar->SetItemCommand( nId, aCommandURL );
-                    OUString sTooltip = vcl::CommandInfoProvider::Instance().GetTooltipForCommand(aCommandURL, m_xFrame);
+                    m_pToolBar->SetItemCommand( nId, aActionURL );
+                    OUString sTooltip = vcl::CommandInfoProvider::Instance().GetTooltipForCommand( aActionURL, m_xFrame );
                     if (!sTooltip.isEmpty())
                         m_pToolBar->SetQuickHelpText( nId, sTooltip );
 
@@ -1055,11 +1057,11 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     // Fill command map. It stores all our commands and from what
                     // image manager we got our image. So we can decide if we have to use an
                     // image from a notification message.
-                    CommandToInfoMap::iterator pIter = m_aCommandMap.find( aCommandURL );
+                    CommandToInfoMap::iterator pIter = m_aCommandMap.find( aActionURL );
                     if ( pIter == m_aCommandMap.end())
                     {
                         aCmdInfo.nId = nId;
-                        const CommandToInfoMap::value_type aValue( aCommandURL, aCmdInfo );
+                        const CommandToInfoMap::value_type aValue( aActionURL, aCmdInfo );
                         m_aCommandMap.insert( aValue );
                     }
                     else
@@ -1457,12 +1459,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
             if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
             {
                 sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
-                OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+                OUString aActionURL = m_pToolBar->GetItemCommand( nId );
                 pVisibleItemsPopupMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
                 pVisibleItemsPopupMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
-                pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
-                Image aImage( vcl::CommandInfoProvider::Instance().GetImageForCommand(aCommandURL, false, m_xFrame) );
-                commandToImage[aCommandURL] = aImage;
+                pVisibleItemsPopupMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aActionURL );
+                Image aImage( vcl::CommandInfoProvider::Instance().GetImageForCommand( aActionURL, false, m_xFrame ) );
+                commandToImage[ aActionURL ] = aImage;
                 pVisibleItemsPopupMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
             }
             else
@@ -1618,25 +1620,25 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
 
             case MENUITEM_TOOLBAR_DOCKTOOLBAR:
             {
-                ExecuteInfo* pExecuteInfo = new ExecuteInfo;
+                GoInfo* pGoInfo = new GoInfo;
 
-                pExecuteInfo->aToolbarResName = m_aResourceName;
-                pExecuteInfo->nCmd            = EXEC_CMD_DOCKTOOLBAR;
-                pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
+                pGoInfo->aToolbarResName = m_aResourceName;
+                pGoInfo->nCmd            = EXEC_CMD_DOCKTOOLBAR;
+                pGoInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
 
-                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pGoInfo );
                 break;
             }
 
             case MENUITEM_TOOLBAR_DOCKALLTOOLBAR:
             {
-                ExecuteInfo* pExecuteInfo = new ExecuteInfo;
+                GoInfo* pGoInfo = new GoInfo;
 
-                pExecuteInfo->aToolbarResName = m_aResourceName;
-                pExecuteInfo->nCmd            = EXEC_CMD_DOCKALLTOOLBARS;
-                pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
+                pGoInfo->aToolbarResName = m_aResourceName;
+                pGoInfo->nCmd            = EXEC_CMD_DOCKALLTOOLBARS;
+                pGoInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
 
-                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pGoInfo );
                 break;
             }
 
@@ -1657,14 +1659,14 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
 
             case MENUITEM_TOOLBAR_CLOSE:
             {
-                ExecuteInfo* pExecuteInfo = new ExecuteInfo;
+                GoInfo* pGoInfo = new GoInfo;
 
-                pExecuteInfo->aToolbarResName = m_aResourceName;
-                pExecuteInfo->nCmd            = EXEC_CMD_CLOSETOOLBAR;
-                pExecuteInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
-                pExecuteInfo->xWindow         = VCLUnoHelper::GetInterface( m_pToolBar );
+                pGoInfo->aToolbarResName = m_aResourceName;
+                pGoInfo->nCmd            = EXEC_CMD_CLOSETOOLBAR;
+                pGoInfo->xLayoutManager  = getLayoutManagerFromFrame( m_xFrame );
+                pGoInfo->xWindow         = VCLUnoHelper::GetInterface( m_pToolBar );
 
-                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo );
+                Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pGoInfo );
                 break;
             }
 
@@ -1689,16 +1691,16 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
                             {
                                 Sequence< PropertyValue > aProp;
                                 sal_Int32                 nVisibleIndex( -1 );
-                                OUString             aCommandURL;
+                                OUString             aActionURL;
                                 bool                  bVisible( false );
 
                                 if ( xItemContainer->getByIndex( i ) >>= aProp )
                                 {
                                     for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
                                     {
-                                        if ( aProp[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
+                                        if ( aProp[j].Name == ITEM_DESCRIPTOR_ACTIONURL )
                                         {
-                                            aProp[j].Value >>= aCommandURL;
+                                            aProp[j].Value >>= aActionURL;
                                         }
                                         else if ( aProp[j].Name == ITEM_DESCRIPTOR_VISIBLE )
                                         {
@@ -1707,7 +1709,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
                                         }
                                     }
 
-                                    if (( aCommandURL == aCommand ) && ( nVisibleIndex >= 0 ))
+                                    if (( aActionURL == aCommand ) && ( nVisibleIndex >= 0 ))
                                     {
                                         // We have found the requested item, toggle the visible flag
                                         // and write back the configuration settings to the toolbar
@@ -1848,43 +1850,44 @@ IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
 
 IMPL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, void*, p, void )
 {
-    ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
+    GoInfo* pGoInfo = static_cast<GoInfo*>(p);
     try
     {
         // Asynchronous execution as this can lead to our own destruction!
-        if (( pExecuteInfo->nCmd == EXEC_CMD_CLOSETOOLBAR ) &&
-            ( pExecuteInfo->xLayoutManager.is() ) &&
-            ( pExecuteInfo->xWindow.is() ))
+        if (( pGoInfo->nCmd == EXEC_CMD_CLOSETOOLBAR ) &&
+            ( pGoInfo->xLayoutManager.is() ) &&
+            ( pGoInfo->xWindow.is() ))
         {
             // Use docking window close to close the toolbar. The toolbar layout manager is
             // listener and will react correctly according to the context sensitive
             // flag of our toolbar.
-            vcl::Window* pWin = VCLUnoHelper::GetWindow( pExecuteInfo->xWindow );
+            vcl::Window* pWin = VCLUnoHelper::GetWindow( pGoInfo->xWindow );
             DockingWindow* pDockWin = dynamic_cast< DockingWindow* >( pWin );
             if ( pDockWin )
                 pDockWin->Close();
         }
-        else if (( pExecuteInfo->nCmd == EXEC_CMD_DOCKTOOLBAR ) &&
-                 ( pExecuteInfo->xLayoutManager.is() ))
+        else if (( pGoInfo->nCmd == EXEC_CMD_DOCKTOOLBAR ) &&
+                 ( pGoInfo->xLayoutManager.is() ))
         {
             css::awt::Point aPoint;
             aPoint.X = aPoint.Y = SAL_MAX_INT32;
-            pExecuteInfo->xLayoutManager->dockWindow( pExecuteInfo->aToolbarResName,
+            pGoInfo->xLayoutManager->dockWindow( pGoInfo->aToolbarResName,
                                                       DockingArea_DOCKINGAREA_DEFAULT,
                                                       aPoint );
         }
-        else if (( pExecuteInfo->nCmd == EXEC_CMD_DOCKALLTOOLBARS ) &&
-                 ( pExecuteInfo->xLayoutManager.is() ))
+        else if (( pGoInfo->nCmd == EXEC_CMD_DOCKALLTOOLBARS ) &&
+                 ( pGoInfo->xLayoutManager.is() ))
         {
-            pExecuteInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR );
+            pGoInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR );
         }
     }
     catch (const Exception&)
     {
     }
 
-    delete pExecuteInfo;
+    delete pGoInfo;
 }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index db77987..9cf3f45 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -30,7 +30,7 @@ static const char MERGE_TOOLBAR_URL[]             = "URL";
 static const char MERGE_TOOLBAR_TITLE[]           = "Title";
 static const char MERGE_TOOLBAR_IMAGEID[]         = "ImageIdentifier";
 static const char MERGE_TOOLBAR_CONTEXT[]         = "Context";
-static const char MERGE_TOOLBAR_TARGET[]          = "Target";
+static const char MERGE_TOOLBAR_RECIPIENT[]       = "Recipient";
 static const char MERGE_TOOLBAR_CONTROLTYPE[]     = "ControlType";
 static const char MERGE_TOOLBAR_WIDTH[]           = "Width";
 
@@ -115,10 +115,10 @@ bool ToolBarMerger::ConvertSeqSeqToVector(
     {
         AddonToolbarItem aAddonToolbarItem;
         ConvertSequenceToValues( rSequence[i],
-                                 aAddonToolbarItem.aCommandURL,
+                                 aAddonToolbarItem.aActionURL,
                                  aAddonToolbarItem.aLabel,
                                  aAddonToolbarItem.aImageIdentifier,
-                                 aAddonToolbarItem.aTarget,
+                                 aAddonToolbarItem.aRecipient,
                                  aAddonToolbarItem.aContext,
                                  aAddonToolbarItem.aControlType,
                                  aAddonToolbarItem.nWidth );
@@ -138,10 +138,10 @@ bool ToolBarMerger::ConvertSeqSeqToVector(
      Provides a sequence of property values.
 
  @param
-     rCommandURL
+     rActionURL
 
      Contains the value of the property with
-     Name="CommandURL".
+     Name="ActionURL".
 
  @param
      rLabel
@@ -156,10 +156,10 @@ bool ToolBarMerger::ConvertSeqSeqToVector(
      Name="ImageIdentifier"
 
  @param
-     rTarget
+     rRecipient
 
      Contains the value of the property with
-     Name="Target"
+     Name="Recipient"
 
  @param
      rContext
@@ -180,10 +180,10 @@ bool ToolBarMerger::ConvertSeqSeqToVector(
 */
 void ToolBarMerger::ConvertSequenceToValues(
     const uno::Sequence< beans::PropertyValue >& rSequence,
-    OUString& rCommandURL,
+    OUString& rActionURL,
     OUString& rLabel,
     OUString& rImageIdentifier,
-    OUString& rTarget,
+    OUString& rRecipient,
     OUString& rContext,
     OUString& rControlType,
     sal_uInt16& rWidth )
@@ -191,22 +191,28 @@ void ToolBarMerger::ConvertSequenceToValues(
     for ( sal_Int32 i = 0; i < rSequence.getLength(); i++ )
     {
         if ( rSequence[i].Name == MERGE_TOOLBAR_URL )
-            rSequence[i].Value >>= rCommandURL;
+            rSequence[i].Value >>= rActionURL;
         else if ( rSequence[i].Name == MERGE_TOOLBAR_TITLE )
             rSequence[i].Value >>= rLabel;
         else if ( rSequence[i].Name == MERGE_TOOLBAR_IMAGEID )
             rSequence[i].Value >>= rImageIdentifier;
         else if ( rSequence[i].Name == MERGE_TOOLBAR_CONTEXT )
             rSequence[i].Value >>= rContext;
-        else if ( rSequence[i].Name == MERGE_TOOLBAR_TARGET )
-            rSequence[i].Value >>= rTarget;
+        else if ( rSequence[i].Name == MERGE_TOOLBAR_RECIPIENT )
+            rSequence[i].Value >>= rRecipient;
+        else if ( rSequence[i].Name == "Target" )
+        {
+            SAL_WARN( "framework", "\"Target\" into \"Recipient\" in ToolBarMerger" );
+            rSequence[i].Value >>= rRecipient;
+            ///rSequence[i].Name = OUString::createFromAscii( MERGE_TOOLBAR_RECIPIENT );
+        }
         else if ( rSequence[i].Name == MERGE_TOOLBAR_CONTROLTYPE )
             rSequence[i].Value >>= rControlType;
         else if ( rSequence[i].Name == MERGE_TOOLBAR_WIDTH )
         {
             sal_Int32 aValue = 0;
             rSequence[i].Value >>= aValue;
-            rWidth = sal_uInt16( aValue );
+            rWidth = static_cast< sal_uInt16 >( aValue );
         }
     }
 }
@@ -454,16 +460,16 @@ bool ToolBarMerger::MergeItems(
             if ( nInsPos > sal_Int32( pToolbar->GetItemCount() ))
                 nInsPos = TOOLBOX_APPEND;
 
-            if ( rItem.aCommandURL == TOOLBOXITEM_SEPARATOR_STR )
+            if ( rItem.aActionURL == TOOLBOXITEM_SEPARATOR_STR )
                 pToolbar->InsertSeparator( sal_uInt16( nInsPos ));
             else
             {
-                CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
+                CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aActionURL );
                 if ( pIter == rCommandMap.end())
                 {
                     CommandInfo aCmdInfo;
                     aCmdInfo.nId = rItemId;
-                    const CommandToInfoMap::value_type aValue( rItem.aCommandURL, aCmdInfo );
+                    const CommandToInfoMap::value_type aValue( rItem.aActionURL, aCmdInfo );
                     rCommandMap.insert( aValue );
                 }
                 else
@@ -602,7 +608,7 @@ bool ToolBarMerger::RemoveItems(
     const uno::Reference< uno::XComponentContext >& rxContext,
     const uno::Reference< frame::XFrame > & xFrame,
     ToolBox*               pToolbar,
-    const OUString& rCommandURL,
+    const OUString& rActionURL,
     sal_uInt16             nId,
     sal_uInt16             nWidth,
     const OUString& rControlType )
@@ -610,25 +616,25 @@ bool ToolBarMerger::RemoveItems(
     ::cppu::OWeakObject* pResult( nullptr );
 
     if ( rControlType == TOOLBARCONTROLLER_BUTTON )
-        pResult = new ButtonToolbarController( rxContext, pToolbar, rCommandURL );
+        pResult = new ButtonToolbarController( rxContext, pToolbar, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_COMBOBOX )
-        pResult = new ComboboxToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL );
+        pResult = new ComboboxToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_EDIT )
-        pResult = new EditToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL );
+        pResult = new EditToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_SPINFIELD )
-        pResult = new SpinfieldToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL );
+        pResult = new SpinfieldToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_IMGBUTTON )
-        pResult = new ImageButtonToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL );
+        pResult = new ImageButtonToolbarController( rxContext, xFrame, pToolbar, nId, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_DROPDOWNBOX )
-        pResult = new DropdownToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL );
+        pResult = new DropdownToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_DROPDOWNBTN )
         pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId,
-                                                     ToggleButtonToolbarController::STYLE_DROPDOWNBUTTON, rCommandURL );
+                                                     ToggleButtonToolbarController::STYLE_DROPDOWNBUTTON, rActionURL );
     else if ( rControlType == TOOLBARCONTROLLER_TOGGLEDDBTN )
         pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId,
-                                                     ToggleButtonToolbarController::STYLE_TOGGLE_DROPDOWNBUTTON, rCommandURL );
+                                                     ToggleButtonToolbarController::STYLE_TOGGLE_DROPDOWNBUTTON, rActionURL );
     else
-        pResult = new GenericToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL );
+        pResult = new GenericToolbarController( rxContext, xFrame, pToolbar, nId, rActionURL );
 
     return pResult;
 }
@@ -636,7 +642,7 @@ bool ToolBarMerger::RemoveItems(
 void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
 {
     pToolbar->InsertItem( nItemId, rItem.aLabel, ToolBoxItemBits::NONE, nPos );
-    pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );
+    pToolbar->SetItemCommand( nItemId, rItem.aActionURL );
     pToolbar->SetQuickHelpText( nItemId, rItem.aLabel );
     pToolbar->SetItemText( nItemId, rItem.aLabel );
     pToolbar->EnableItem( nItemId );
@@ -645,7 +651,7 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u
     // Use the user data to store add-on specific data with the toolbar item
     AddonsParams* pAddonParams = new AddonsParams;
     pAddonParams->aImageId     = rItem.aImageIdentifier;
-    pAddonParams->aTarget      = rItem.aTarget;
+    pAddonParams->aRecipient   = rItem.aRecipient;
     pAddonParams->aControlType = rItem.aControlType;
     pAddonParams->nWidth       = rItem.nWidth;
     pToolbar->SetItemData( nItemId, pAddonParams );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 1b649c8..85daea0 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -149,23 +149,23 @@ ToolbarsMenuController::~ToolbarsMenuController()
 }
 
 void ToolbarsMenuController::addCommand(
-    Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& rLabel )
+    Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rActionURL, const OUString& rLabel )
 {
     sal_uInt16        nItemId    = m_xPopupMenu->getItemCount()+1;
 
     OUString aLabel;
     if ( rLabel.isEmpty() )
-        aLabel = vcl::CommandInfoProvider::Instance().GetMenuLabelForCommand( rCommandURL, m_xFrame );
+        aLabel = vcl::CommandInfoProvider::Instance().GetMenuLabelForCommand( rActionURL, m_xFrame );
     else
         aLabel = rLabel;
 
     rPopupMenu->insertItem( nItemId, aLabel, 0, nItemId );
-    rPopupMenu->setCommand( nItemId, rCommandURL );
+    rPopupMenu->setCommand( nItemId, rActionURL );
 
-    bool bInternal = rCommandURL.startsWith( STATIC_INTERNAL_CMD_PART );
+    bool bInternal = rActionURL.startsWith( STATIC_INTERNAL_CMD_PART );
     if ( !bInternal )
     {
-        if ( !getDispatchFromCommandURL( rCommandURL ).is() )
+        if ( !getDispatchFromActionURL( rActionURL ).is() )
             m_xPopupMenu->enableItem( nItemId, false );
     }
 
@@ -175,7 +175,7 @@ void ToolbarsMenuController::addCommand(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
     if ( rSettings.GetUseImagesInMenus() )
-        aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( rCommandURL, false, m_xFrame );
+        aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( rActionURL, false, m_xFrame );
 
     VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXPopupMenu::GetImplementation( rPopupMenu ));
     if ( pPopupMenu )
@@ -185,12 +185,12 @@ void ToolbarsMenuController::addCommand(
             pVCLPopupMenu->SetItemImage( nItemId, aImage );
     }
 
-    m_aCommandVector.push_back( rCommandURL );
+    m_aCommandVector.push_back( rActionURL );
 }
 
-Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const OUString& rCommandURL )
+Reference< XDispatch > ToolbarsMenuController::getDispatchFromActionURL( const OUString& rActionURL )
 {
-    URL                          aTargetURL;
+    URL                          aURL;
     Reference< XURLTransformer > xURLTransformer;
     Reference< XFrame >          xFrame;
 
@@ -200,11 +200,11 @@ Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const
         xFrame = m_xFrame;
     }
 
-    aTargetURL.Complete = rCommandURL;
-    xURLTransformer->parseStrict( aTargetURL );
+    aURL.Complete = rActionURL;
+    xURLTransformer->parseStrict( aURL );
     Reference< XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY );
     if ( xDispatchProvider.is() )
-        return xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+        return xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
     else
         return Reference< XDispatch >();
 }
@@ -652,22 +652,22 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
             }
             else if ( aCmd.indexOf( STATIC_CMD_PART ) < 0 )
             {
-                URL                     aTargetURL;
+                URL aURL;
                 Sequence<PropertyValue> aArgs;
 
-                aTargetURL.Complete = aCmd;
-                xURLTransformer->parseStrict( aTargetURL );
+                aURL.Complete = aCmd;
+                xURLTransformer->parseStrict( aURL );
                 Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
                 if ( xDispatchProvider.is() )
                 {
                     Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(
-                                                            aTargetURL, OUString(), 0 );
+                                                            aURL, OUString(), 0 );
 
-                    ExecuteInfo* pExecuteInfo = new ExecuteInfo;
-                    pExecuteInfo->xDispatch     = xDispatch;
-                    pExecuteInfo->aTargetURL    = aTargetURL;
-                    pExecuteInfo->aArgs         = aArgs;
-                    Application::PostUserEvent( LINK(nullptr, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
+                    GoInfo* pGoInfo = new GoInfo;
+                    pGoInfo->xDispatch = xDispatch;
+                    pGoInfo->aURL = aURL;
+                    pGoInfo->aArgs = aArgs;
+                    Application::PostUserEvent( LINK(nullptr, ToolbarsMenuController, ExecuteHdl_Impl), pGoInfo );
                 }
             }
             else
@@ -722,14 +722,14 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent&
 
         if ( !bInternal )
         {
-            URL aTargetURL;
-            aTargetURL.Complete = aCmdVector[i];
-            xURLTransformer->parseStrict( aTargetURL );
-            Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+            URL aURL;
+            aURL.Complete = aCmdVector[i];
+            xURLTransformer->parseStrict( aURL );
+            Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
             if ( xDispatch.is() )
             {
-                xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
-                xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+                xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aURL );
+                xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aURL );
             }
         }
         else if ( aCmdVector[i] == CMD_RESTOREVISIBILITY )
@@ -807,22 +807,22 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
 
 IMPL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, void*, p, void )
 {
-    ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
+    GoInfo* pGoInfo = static_cast<GoInfo*>(p);
     try
     {
         // Asynchronous execution as this can lead to our own destruction!
         // Framework can recycle our current frame and the layout manager disposes all user interface
         // elements if a component gets detached from its frame!
-        if ( pExecuteInfo->xDispatch.is() )
+        if ( pGoInfo->xDispatch.is() )
         {
-            pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
+            pGoInfo->xDispatch->dispatch( pGoInfo->aURL, pGoInfo->aArgs );
         }
     }
     catch ( const Exception& )
     {
     }
 
-    delete pExecuteInfo;
+    delete pGoInfo;
 }
 
 }
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 63fd3e9..2e8481a 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -55,7 +55,7 @@ static const char CONFIGURATION_PROPERTY_LABEL[]        = "Label";
 static const char CONFIGURATION_PROPERTY_CONTEXT_LABEL[] = "ContextLabel";
 static const char CONFIGURATION_PROPERTY_POPUP_LABEL[]   = "PopupLabel";
 static const char CONFIGURATION_PROPERTY_TOOLTIP_LABEL[] = "TooltipLabel";
-static const char CONFIGURATION_PROPERTY_TARGET_URL[]    = "TargetURL";
+static const char CONFIGURATION_PROPERTY_RECIPIENT_URL[] = "RecipientURL";
 
 // Property names of the resulting Property Set
 static const char PROPSET_LABEL[]                       = "Label";
@@ -63,7 +63,7 @@ static const char PROPSET_NAME[]                        = "Name";
 static const char PROPSET_POPUP[]                       = "Popup";
 static const char PROPSET_POPUPLABEL[]                  = "PopupLabel";
 static const char PROPSET_TOOLTIPLABEL[]                = "TooltipLabel";
-static const char PROPSET_TARGETURL[]                   = "TargetURL";
+static const char PROPSET_RECIPIENTURL[]                = "RecipientURL";
 static const char PROPSET_PROPERTIES[]                  = "Properties";
 
 // Special resource URLs to retrieve additional information
@@ -125,14 +125,14 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
             OUString            aCommandName;
             OUString            aPopupLabel;
             OUString            aTooltipLabel;
-            OUString            aTargetURL;
+            OUString            aURL;
             bool                bPopup : 1,
                                 bCommandNameCreated : 1;
             sal_Int32           nProperties;
         };
 
-        Any                       getSequenceFromCache( const OUString& aCommandURL );
-        Any                       getInfoFromCommand( const OUString& rCommandURL );
+        Any                       getSequenceFromCache( const OUString& aActionURL );
+        Any                       getInfoFromCommand( const OUString& rActionURL );
         void                      fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel );
         Sequence< OUString > getAllCommands();
         void                  fillCache();
@@ -155,13 +155,13 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
         OUString                     m_aPropUIContextLabel;
         OUString                     m_aPropUIPopupLabel;
         OUString                     m_aPropUITooltipLabel;
-        OUString                     m_aPropUITargetURL;
+        OUString                     m_aPropUIRecipientURL;
         OUString                     m_aPropLabel;
         OUString                     m_aPropName;
         OUString                     m_aPropPopup;
         OUString                     m_aPropPopupLabel;
         OUString                     m_aPropTooltipLabel;
-        OUString                     m_aPropTargetURL;
+        OUString                     m_aPropRecipientURL;
         OUString                     m_aPropProperties;
         OUString                     m_aPrivateResourceURL;
         Reference< XNameAccess >          m_xGenericUICommands;
@@ -188,13 +188,13 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aM
     m_aPropUIContextLabel( CONFIGURATION_PROPERTY_CONTEXT_LABEL ),
     m_aPropUIPopupLabel( CONFIGURATION_PROPERTY_POPUP_LABEL ),
     m_aPropUITooltipLabel( CONFIGURATION_PROPERTY_TOOLTIP_LABEL ),
-    m_aPropUITargetURL( CONFIGURATION_PROPERTY_TARGET_URL ),
+    m_aPropUIRecipientURL( CONFIGURATION_PROPERTY_RECIPIENT_URL ),
     m_aPropLabel( PROPSET_LABEL ),
     m_aPropName( PROPSET_NAME ),
     m_aPropPopup( PROPSET_POPUP ),
     m_aPropPopupLabel( PROPSET_POPUPLABEL ),
     m_aPropTooltipLabel( PROPSET_TOOLTIPLABEL ),
-    m_aPropTargetURL( PROPSET_TARGETURL ),
+    m_aPropRecipientURL( PROPSET_RECIPIENTURL ),
     m_aPropProperties( PROPSET_PROPERTIES ),
     m_aPrivateResourceURL( PRIVATE_RESOURCE_URL ),
     m_xGenericUICommands( rGenericUICommands ),
@@ -225,7 +225,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
 }
 
 // XNameAccess
-Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
+Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rActionURL )
 {
     static sal_Int32 nRequests  = 0;
 
@@ -237,17 +237,17 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm
         fillCache();
     }
 
-    if ( rCommandURL.startsWith( m_aPrivateResourceURL ) )
+    if ( rActionURL.startsWith( m_aPrivateResourceURL ) )
     {
         // special keys to retrieve information about a set of commands
         // SAFE
         addGenericInfoToCache();
 
-        if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ))
+        if ( rActionURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ))
             return makeAny( m_aCommandImageList );
-        else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))
+        else if ( rActionURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))
             return makeAny( m_aCommandRotateImageList );
-        else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))
+        else if ( rActionURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))
             return makeAny( m_aCommandMirrorImageList );
         else
             return Any();
@@ -256,14 +256,14 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm
     {
         // SAFE
         ++nRequests;
-        return getInfoFromCommand( rCommandURL );
+        return getInfoFromCommand( rActionURL );
     }
 }
 
-Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL )
+Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rActionURL )
 throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
-    Any aRet( getByNameImpl( rCommandURL ) );
+    Any aRet( getByNameImpl( rActionURL ) );
     if( !aRet.hasValue() )
         throw NoSuchElementException();
 
@@ -276,10 +276,10 @@ throw ( RuntimeException, std::exception )
     return getAllCommands();
 }
 
-sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL )
+sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rActionURL )
 throw (css::uno::RuntimeException, std::exception)
 {
-    return getByNameImpl( rCommandURL ).hasValue();
+    return getByNameImpl( rActionURL ).hasValue();
 }
 
 // XElementAccess
@@ -305,9 +305,9 @@ void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo,
     rCmdInfo.bCommandNameCreated = true;
 }
 
-Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aCommandURL )
+Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aActionURL )
 {
-    CommandToInfoCache::iterator pIter = m_aCmdInfoCache.find( aCommandURL );
+    CommandToInfoCache::iterator pIter = m_aCmdInfoCache.find( aActionURL );
     if ( pIter != m_aCmdInfoCache.end() )
     {
         if ( !pIter->second.bCommandNameCreated )
@@ -327,13 +327,14 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman
         aPropSeq[4].Value <<= pIter->second.aPopupLabel;
         aPropSeq[5].Name  = m_aPropTooltipLabel;
         aPropSeq[5].Value <<= pIter->second.aTooltipLabel;
-        aPropSeq[6].Name  = m_aPropTargetURL;
-        aPropSeq[6].Value <<= pIter->second.aTargetURL;
+        aPropSeq[6].Name  = m_aPropRecipientURL;
+        aPropSeq[6].Value <<= pIter->second.aURL;
         return makeAny( aPropSeq );
     }
 
     return Any();
 }
+
 void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,bool _bPopup,
                                                 std::vector< OUString >& aImageCommandVector,
                                                 std::vector< OUString >& aImageRotateVector,
@@ -357,7 +358,7 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
                     xNameAccess->getByName( m_aPropUIContextLabel ) >>= aCmdToInfo.aContextLabel;
                     xNameAccess->getByName( m_aPropUIPopupLabel )   >>= aCmdToInfo.aPopupLabel;
                     xNameAccess->getByName( m_aPropUITooltipLabel )   >>= aCmdToInfo.aTooltipLabel;
-                    xNameAccess->getByName( m_aPropUITargetURL )    >>= aCmdToInfo.aTargetURL;
+                    xNameAccess->getByName( m_aPropUIRecipientURL )    >>= aCmdToInfo.aURL;
                     xNameAccess->getByName( m_aPropProperties )     >>= aCmdToInfo.nProperties;
 
                     m_aCmdInfoCache.insert( CommandToInfoCache::value_type( aNameSeq[i], aCmdToInfo ));
@@ -436,22 +437,22 @@ void ConfigurationAccess_UICommand::addGenericInfoToCache()
     }
 }
 
-Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandURL )
+Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rActionURL )
 {
     Any a;
 
     try
     {
-        a = getSequenceFromCache( rCommandURL );
+        a = getSequenceFromCache( rActionURL );
         if ( !a.hasValue() )
         {
             // First try to ask our global commands configuration access. It also caches maybe
             // we find the entry in its cache first.
-            if ( m_xGenericUICommands.is() && m_xGenericUICommands->hasByName( rCommandURL ) )
+            if ( m_xGenericUICommands.is() && m_xGenericUICommands->hasByName( rActionURL ) )
             {
                 try
                 {
-                    return m_xGenericUICommands->getByName( rCommandURL );
+                    return m_xGenericUICommands->getByName( rActionURL );
                 }
                 catch (const css::lang::WrappedTargetException&)
                 {
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index fdc06a6..15591b4 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -44,9 +44,9 @@ using namespace com::sun::star::container;
 
 namespace framework
 {
-OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName )
+OUString getHashKeyFromStrings( const OUString& aActionURL, const OUString& aModuleName )
 {
-    OUStringBuffer aKey( aCommandURL );
+    OUStringBuffer aKey( aActionURL );
     aKey.append( "-" );
     aKey.append( aModuleName );
     return aKey.makeStringAndClear();
@@ -74,17 +74,17 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
         xContainer->removeContainerListener(m_xConfigAccessListener);
 }
 
-OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
+OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rActionURL, const OUString& rModule ) const
 {
     osl::MutexGuard g(m_mutex);
-    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
+    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rActionURL, rModule ));
 
     if ( pIter != m_aMenuControllerMap.end() )
         return pIter->second.m_aImplementationName;
     else if ( !rModule.isEmpty() )
     {
         // Try to detect if we have a generic popup menu controller
-        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() ));
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rActionURL, OUString() ));
 
         if ( pIter != m_aMenuControllerMap.end() )
             return pIter->second.m_aImplementationName;
@@ -92,18 +92,19 @@ OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( con
 
     return OUString();
 }
-OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
+
+OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rActionURL, const OUString& rModule ) const
 {
     osl::MutexGuard g(m_mutex);
 
-    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
+    MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rActionURL, rModule ));
 
     if ( pIter != m_aMenuControllerMap.end() )
         return pIter->second.m_aValue;
     else if ( !rModule.isEmpty() )
     {
         // Try to detect if we have a generic popup menu controller
-        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() ));
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rActionURL, OUString() ));
 
         if ( pIter != m_aMenuControllerMap.end() )
             return pIter->second.m_aValue;
@@ -113,23 +114,23 @@ OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const
 }
 
 void ConfigurationAccess_ControllerFactory::addServiceToCommandModule(
-    const OUString& rCommandURL,
+    const OUString& rActionURL,
     const OUString& rModule,
     const OUString& rServiceSpecifier )
 {
     osl::MutexGuard g(m_mutex);
 
-    OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    OUString aHashKey = getHashKeyFromStrings( rActionURL, rModule );
     m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,OUString()) ));
 }
 
 void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
-    const OUString& rCommandURL,
+    const OUString& rActionURL,
     const OUString& rModule )
 {
     osl::MutexGuard g(m_mutex);
 
-    OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    OUString aHashKey = getHashKeyFromStrings( rActionURL, rModule );
     m_aMenuControllerMap.erase( aHashKey );
 }
 
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index ad280b4..9e833a0 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -55,9 +55,9 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // XUIControllerRegistration
-    virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasController( const OUString& aActionURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerController( const OUString& aActionURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deregisterController( const OUString& aActionURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
 
 protected:
     UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode  );
@@ -146,7 +146,7 @@ throw (Exception, RuntimeException, std::exception)
 
     // Append the command URL to the Arguments sequence so that one controller can be
     // used for more than one command URL.
-    aPropValue.Name     = "CommandURL";
+    aPropValue.Name     = "ActionURL";
     aPropValue.Value  <<= ServiceSpecifier;
     aNewArgs[nAppendIndex] <<= aPropValue;
 
@@ -186,7 +186,7 @@ throw (RuntimeException, std::exception)
 
 // XUIControllerRegistration
 sal_Bool SAL_CALL UIControllerFactory::hasController(
-    const OUString& aCommandURL,
+    const OUString& aActionURL,
     const OUString& aModuleName )
 throw (css::uno::RuntimeException, std::exception)
 {
@@ -198,11 +198,11 @@ throw (css::uno::RuntimeException, std::exception)
         m_pConfigAccess->readConfigurationData();
     }
 
-    return ( !m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).isEmpty() );
+    return ( !m_pConfigAccess->getServiceFromCommandModule( aActionURL, aModuleName ).isEmpty() );
 }
 
 void SAL_CALL UIControllerFactory::registerController(
-    const OUString& aCommandURL,
+    const OUString& aActionURL,
     const OUString& aModuleName,
     const OUString& aControllerImplementationName )
 throw (RuntimeException, std::exception)
@@ -216,12 +216,12 @@ throw (RuntimeException, std::exception)
         m_pConfigAccess->readConfigurationData();
     }
 
-    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
+    m_pConfigAccess->addServiceToCommandModule( aActionURL, aModuleName, aControllerImplementationName );
     // SAFE
 }
 
 void SAL_CALL UIControllerFactory::deregisterController(
-    const OUString& aCommandURL,
+    const OUString& aActionURL,
     const OUString& aModuleName )
 throw (RuntimeException, std::exception)
 {
@@ -234,7 +234,7 @@ throw (RuntimeException, std::exception)
         m_pConfigAccess->readConfigurationData();
     }
 
-    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
+    m_pConfigAccess->removeServiceFromCommandModule( aActionURL, aModuleName );
     // SAFE
 }
 
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index fe58cc7..9b58ecd 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -216,7 +216,7 @@ void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString
 {
 }
 
-void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
+void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sRecipient*/,
                                                                     const OUString& /*sData*/  )
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException, std::exception )
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 913324f..dabca1e 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -320,7 +320,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
                         {
                             case IMG_ATTRIBUTE_COMMAND:
                             {
-                                pItem->aCommandURL  = xAttribs->getValueByIndex( n );
+                                pItem->aActionURL  = xAttribs->getValueByIndex( n );
                             }
                             break;
 
@@ -348,7 +348,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
                 }
 
                 // Check required attribute "command"
-                if ( pItem->aCommandURL.isEmpty() )
+                if ( pItem->aActionURL.isEmpty() )
                 {
                     delete m_pImages;
                     m_pImages = nullptr;
@@ -432,7 +432,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
                         {
                             case IMG_ATTRIBUTE_COMMAND:
                             {
-                                pItem->aCommandURL  = xAttribs->getValueByIndex( n );
+                                pItem->aActionURL  = xAttribs->getValueByIndex( n );
                             }
                             break;
 
@@ -449,7 +449,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
                 }
 
                 // Check required attribute "command"
-                if ( pItem->aCommandURL.isEmpty() )
+                if ( pItem->aActionURL.isEmpty() )
                 {
                     delete m_pImages;
                     delete m_pExternalImages;
@@ -557,7 +557,7 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadImagesDocumentHandler::processingInstruction(
-    const OUString& /*aTarget*/, const OUString& /*aData*/ )
+    const OUString& /*aRecipient*/, const OUString& /*aData*/ )
 throw(  SAXException, RuntimeException, std::exception )
 {
 }
@@ -740,7 +740,7 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage
 
     pList->AddAttribute( m_aXMLImageNS + ATTRIBUTE_COMMAND,
                          m_aAttributeType,
-                         pImage->aCommandURL );
+                         pImage->aActionURL );
 
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_ENTRY, xList );
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
@@ -784,11 +784,11 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes
                              pExternalImage->aURL );
     }
 
-    if ( !pExternalImage->aCommandURL.isEmpty() )
+    if ( !pExternalImage->aActionURL.isEmpty() )
     {
         pList->AddAttribute( m_aXMLImageNS + ATTRIBUTE_COMMAND,
                              m_aAttributeType,
-                             pExternalImage->aCommandURL );
+                             pExternalImage->aActionURL );
     }
 
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_EXTERNALENTRY, xList );
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index c11eea1..50edbf0 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -48,15 +48,15 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
     public:
         virtual ~AddonPopupMenu() override;
 
-        // Check if command URL string has the unique prefix to identify addon popup menus
-        static bool        IsCommandURLPrefix( const OUString& aCmdURL );
+        // Check if URL has the unique prefix
+        static bool        IsActionURLPrefix( const OUString& aURL );
 
-        void               SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
+        void               SetActionURL( const OUString& aURL ) {  m_aActionURL = aURL;  }
 
     private:
         AddonPopupMenu();
 
-        OUString               m_aCommandURL;
+        OUString               m_aActionURL;
 
     friend class AddonMenuManager;
     friend class ::VclPtr<AddonPopupMenu>;
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 30a46a9..38c30e2 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -35,7 +35,7 @@
 *//*-*************************************************************************************************************/
 #define ADDONSMENUITEM_STRING_URL                       "URL"
 #define ADDONSMENUITEM_STRING_TITLE                     "Title"
-#define ADDONSMENUITEM_STRING_TARGET                    "Target"
+#define ADDONSMENUITEM_STRING_RECIPIENT                 "Recipient"
 #define ADDONSMENUITEM_STRING_IMAGEIDENTIFIER           "ImageIdentifier"
 #define ADDONSMENUITEM_STRING_CONTEXT                   "Context"
 #define ADDONSMENUITEM_STRING_SUBMENU                   "Submenu"
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index 3cca78c..b65a004 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -91,8 +91,8 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
         virtual css::uno::Any SAL_CALL executeDispatch(
                                         const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
                                         const OUString&                                      sURL              ,
-                                        const OUString&                                      sTargetFrameName  ,
-                                              sal_Int32                                             nSearchFlags      ,
+                                        const OUString&                                      sRecipientFrameName  ,
+                                              sal_Int32                                             nSearchOptions      ,
                                         const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
         throw(css::uno::RuntimeException, std::exception) override;
 
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 3a618c2..b5db907 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -60,7 +60,7 @@ private:
 
     MenuAttributes(const OUString& rFrame, const OUString& rImageIdStr)
         : refCount(0)
-        , aTargetFrame(rFrame)
+        , aFrame(rFrame)
         , aImageId(rImageIdStr)
     {
     }
@@ -74,7 +74,7 @@ private:
     MenuAttributes(const MenuAttributes&) = delete;
 
 public:
-    OUString aTargetFrame;
+    OUString aFrame;
     OUString aImageId;
     css::uno::WeakReference<css::frame::XDispatchProvider> xDispatchProvider;
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 9d44e99..d3f2327 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2575,6 +2575,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/frame,\
 	FeatureStateEvent \
 	FrameAction \
 	FrameActionEvent \
+	FrameSearchOption \
 	FrameSearchFlag \
 	IllegalArgumentIOException \
 	LayoutManagerEvents \
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index eae1162..5fe3830 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -50,23 +50,23 @@ published struct DispatchDescriptor
      */
     com::sun::star::util::URL FeatureURL;
 
-    /** name of the target frame
+    /** name of the recipient frame
 
         <p>
-        Special targets (e.g. "_blank", "_self") or really existing target names can be used.
+        Special recipients (e.g. "_blank", "_self") or really existing name of recipient may be used.
         </p>
 
         @see XDispatchProvider::queryDispatch()
      */
     string FrameName;
 
-    /** describes how the target frame is to be searched
+    /** describes how the recipient frame is to be searched
 
         <p>
-        This optional parameter is used if <var>FrameName</var> isn't a special target only.
+        This optional parameter is used if <var>FrameName</var> isn't a special recipient only.
         </p>
 
-        @see FrameSearchFlag
+        @see FrameSearchOption
      */
     long SearchFlags;
 };
diff --git a/offapi/com/sun/star/frame/FrameSearchFlag.idl b/offapi/com/sun/star/frame/FrameSearchFlag.idl
index ad0a5e1..114b552 100644
--- a/offapi/com/sun/star/frame/FrameSearchFlag.idl
+++ b/offapi/com/sun/star/frame/FrameSearchFlag.idl
@@ -20,28 +20,17 @@
 #define __com_sun_star_frame_FrameSearchFlag_idl__
 
 
-
  module com {  module sun {  module star {  module frame {
 
-/** these types describe the algorithm to be used to search a frame
-
-    <p>
-    Such flags will be used on methods XFrame::findFrame(),
-    XDispatchProvider::queryDispatch() or
-    XComponentLoader::loadComponentFromURL() if no special target
-    frame name (e.g. "_blank", "_self") is used.
-    </p>
-
-    @see XFrame::findFrame()
-    @see XDispatchProvider::queryDispatch()
-    @see XComponentLoader::loadComponentFromURL()
+/*
+    it is left for backward compatibility
  */
+
 published constants FrameSearchFlag
 {
-    /** no longer supported
-
+    /**
         <p>
-        Using of this flag will do nothing. Use right combination of other flags
+        Use of this flag does nothing. Choose combination of other flags
         instead of this one.
         </p>
 
@@ -49,62 +38,17 @@ published constants FrameSearchFlag
      */
     const long AUTO = 0;
 
-    /** allows search on the parent frames
-     */
     const long PARENT = 1;
-
-    /** includes the start frame himself
-     */
     const long SELF = 2;
-
-        /** includes all child frames of the start frame
-
-            <p>
-            Note: That means all direct children and of course her children too.
-                  Search doesn't stop at the next level inside the tree!
-            </p>
-         */
     const long CHILDREN = 4;
-
-    /** frame will be created if not found
-     */
     const long CREATE = 8;
-
-        /** includes the direct siblings of the start frame
-
-            <p>
-            Normally it's interpreted as search on the direct children of the parent
-            only. But in combination with e.g. the CHILDREN flag it can include all
-            children of it too.
-            </p>
-     */
     const long SIBLINGS = 16;
-
-        /** allow the search outside the current sub task tree of the whole possible frame tree
-
-        <p>
-        If this flag isn't present, any search from bottom to top has to stop, if a top frame
-        will be reached. It doesn't influence a search from top to bottom.
-        But it can be used at the root of the frame tree to search on direct children of it only.
-        Because the direct children of the root node are the root's of the task sub trees, which
-        are top frames too. Instead of using the CHILDREN flag there, it's possible so to suppress
-        a deeper search so.
-        </p>
-     */
     const long TASKS = 32;
 
-        /** includes all frames except frames in other tasks sub trees
-        but doesn't create any new frame
-     */
     const long ALL = 23;
-
-    /** searches in the whole hierarchy of frames
-        but doesn't create any new frame
-     */
     const long GLOBAL = 55;
 };
 
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/frame/FrameSearchOption.idl b/offapi/com/sun/star/frame/FrameSearchOption.idl
new file mode 100644
index 0000000..188c0bf
--- /dev/null
+++ b/offapi/com/sun/star/frame/FrameSearchOption.idl
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef __com_sun_star_frame_FrameSearchOption_idl__
+#define __com_sun_star_frame_FrameSearchOption_idl__
+
+ module com {  module sun {  module star {  module frame {
+
+/** These constants describe the algorithm to be used to search a frame
+
+    <p>
+    These options will be used with methods XFrame::findFrame(),
+    XDispatchProvider::queryDispatch() or
+    XComponentLoader::loadComponentFromURL() if no special frame name
+    e.g. "_blank", "_self" is specified.
+    </p>
+
+    @see XFrame::findFrame()
+    @see XDispatchProvider::queryDispatch()
+    @see XComponentLoader::loadComponentFromURL()
+ */
+published constants FrameSearchOption
+{
+
+    /** allows search on the parent frames
+     */
+    const long Parent = 1 << 0;
+
+    /** include the frame himself
+     */
+    const long Self = 1 << 1;
+
+        /** include all child frames
+
+            <p>
+            Note: That means all direct children and of course her children too.
+                  Search doesn't stop at the next level inside the tree
+            </p>
+         */
+    const long Children = 1 << 2;
+
+    /** frame will be created if not found
+     */
+    const long Create = 1 << 3;
+
+        /** includes the direct siblings of the frame
+
+            <p>
+            Normally it's interpreted as search on the direct children of the parent
+            only. But in combination with e.g. the Children option it can include all
+            childrens of it too.
+            </p>
+     */
+    const long Siblings = 1 << 4;
+
+        /** allow the search outside the current sub task tree of the whole possible frame tree
+
+        <p>
+        If this option isn't present, any search from bottom to top has to stop, if a top frame
+        will be reached. It doesn't influence a search from top to bottom.
+        But it can be used at the root of the frame tree to search on direct children of it only.
+        Because the direct children of the root node are the root's of the task sub trees, which
+        are top frames too. Instead of using the Children option there, it's possible to suppress
+        a deeper search.
+        </p>
+     */
+    const long Tasks = 1 << 5;
+
+        /** includes all frames except frames in other tasks sub trees
+            but doesn't create any new frame
+        */
+    const long All = Parent | Self | Children | Siblings;
+
+    /** searches in the whole hierarchy of frames but doesn't create any new frame
+     */
+    const long Global = All | Tasks;
+
+    const long FullMask = Tasks | Siblings | Create | Children | Self | Parent ;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
