diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component
index 306e517ef2ea..612819865a80 100644
--- a/sax/source/expatwrap/expwrap.component
+++ b/sax/source/expatwrap/expwrap.component
@@ -20,15 +20,15 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.extensions.xml.sax.ParserExpat"
-      constructor="com_sun_star_comp_extensions_xml_sax_ParserExpat">
+      constructor="com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation">
     <service name="com.sun.star.xml.sax.Parser"/>
   </implementation>
   <implementation name="com.sun.star.extensions.xml.sax.Writer"
-      constructor="com_sun_star_extensions_xml_sax_Writer">
+      constructor="com_sun_star_extensions_xml_sax_Writer_get_implementation">
     <service name="com.sun.star.xml.sax.Writer"/>
   </implementation>
   <implementation name="com.sun.star.comp.extensions.xml.sax.FastParser"
-      constructor="com_sun_star_comp_extensions_xml_sax_FastParser">
+      constructor="com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation">
      <service name="com.sun.star.xml.sax.FastParser"/>
   </implementation>
 </component>
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 19f2f3a723f1..456aca2f50e5 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -1020,7 +1020,7 @@ void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis )
 } // namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_extensions_xml_sax_ParserExpat(
+com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 38975bf59cf3..7f0d498ae2cc 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -1373,7 +1373,7 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc
 } // namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_extensions_xml_sax_Writer(
+com_sun_star_extensions_xml_sax_Writer_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 99a8e93154e8..5f86b88bf5dc 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1427,7 +1427,7 @@ bool FastSaxParser::hasNamespaceURL( const OUString& rPrefix ) const
 } // namespace sax_fastparser
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_extensions_xml_sax_FastParser(
+com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 977a7978b0bc..ca66017a9e87 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -1350,7 +1350,7 @@ void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt
 } // namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_NestedRegistry(
+com_sun_star_comp_stoc_NestedRegistry_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index afc6236975e9..7b7a13cca5ef 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1817,7 +1817,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_ImplementationRegistration(
+com_sun_star_comp_stoc_ImplementationRegistration_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index bdd90c4ed878..b8e196ab3d0f 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -165,7 +165,7 @@ sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_DLLComponentLoader(
+com_sun_star_comp_stoc_DLLComponentLoader_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 0be6b2c1eb9e..9edb8c4edef3 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -980,7 +980,7 @@ Sequence< OUString > AccessController::getSupportedServiceNames()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_security_comp_stoc_AccessController(
+com_sun_star_security_comp_stoc_AccessController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 8dc3a47c78fd..47d1ae602a3e 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -542,7 +542,7 @@ Sequence< OUString > FilePolicy::getSupportedServiceNames()
 } // namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_security_comp_stoc_FilePolicy(
+com_sun_star_security_comp_stoc_FilePolicy_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 5dfaba65d6df..42531052a39c 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1671,7 +1671,7 @@ Any ORegistryServiceManager::getPropertyValue(const OUString& PropertyName)
 } // namespace
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_OServiceManager(
+com_sun_star_comp_stoc_OServiceManager_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1682,7 +1682,7 @@ com_sun_star_comp_stoc_OServiceManager(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_ORegistryServiceManager(
+com_sun_star_comp_stoc_ORegistryServiceManager_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1693,7 +1693,7 @@ com_sun_star_comp_stoc_ORegistryServiceManager(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_OServiceManagerWrapper(
+com_sun_star_comp_stoc_OServiceManagerWrapper_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index fac51ceee79d..97fe443a9762 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -1124,7 +1124,7 @@ void SimpleRegistry::mergeKey(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_stoc_SimpleRegistry(
+com_sun_star_comp_stoc_SimpleRegistry_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component
index 81f622e2d222..b6d5a7b8105c 100644
--- a/stoc/util/bootstrap.component
+++ b/stoc/util/bootstrap.component
@@ -20,37 +20,37 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.DLLComponentLoader"
-      constructor="com_sun_star_comp_stoc_DLLComponentLoader">
+      constructor="com_sun_star_comp_stoc_DLLComponentLoader_get_implementation">
     <service name="com.sun.star.loader.SharedLibrary"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.ImplementationRegistration"
-      constructor="com_sun_star_comp_stoc_ImplementationRegistration">
+      constructor="com_sun_star_comp_stoc_ImplementationRegistration_get_implementation">
     <service name="com.sun.star.registry.ImplementationRegistration"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.NestedRegistry"
-      constructor="com_sun_star_comp_stoc_NestedRegistry">
+      constructor="com_sun_star_comp_stoc_NestedRegistry_get_implementation">
     <service name="com.sun.star.registry.NestedRegistry"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.ORegistryServiceManager"
-      constructor="com_sun_star_comp_stoc_ORegistryServiceManager">
+      constructor="com_sun_star_comp_stoc_ORegistryServiceManager_get_implementation">
     <service name="com.sun.star.lang.RegistryServiceManager"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.OServiceManager"
-      constructor="com_sun_star_comp_stoc_OServiceManager">
+      constructor="com_sun_star_comp_stoc_OServiceManager_get_implementation">
     <service name="com.sun.star.lang.ServiceManager"/>
   </implementation>
   <implementation name="com.sun.star.comp.stoc.OServiceManagerWrapper"
-      constructor="com_sun_star_comp_stoc_OServiceManagerWrapper"/>
+      constructor="com_sun_star_comp_stoc_OServiceManagerWrapper_get_implementation"/>
   <implementation name="com.sun.star.comp.stoc.SimpleRegistry"
-      constructor="com_sun_star_comp_stoc_SimpleRegistry">
+      constructor="com_sun_star_comp_stoc_SimpleRegistry_get_implementation">
     <service name="com.sun.star.registry.SimpleRegistry"/>
   </implementation>
   <implementation name="com.sun.star.security.comp.stoc.AccessController"
-      constructor="com_sun_star_security_comp_stoc_AccessController">
+      constructor="com_sun_star_security_comp_stoc_AccessController_get_implementation">
     <service name="com.sun.star.security.AccessController"/>
   </implementation>
   <implementation name="com.sun.star.security.comp.stoc.FilePolicy"
-      constructor="com_sun_star_security_comp_stoc_FilePolicy">
+      constructor="com_sun_star_security_comp_stoc_FilePolicy_get_implementation">
     <service name="com.sun.star.security.Policy"/>
   </implementation>
 </component>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index c6a5feb91974..861c42a9eeb9 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -489,7 +489,7 @@ Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShap
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory(
+com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 7f35df7288e1..abcdd911dc0d 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -88,7 +88,7 @@ Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory(
+com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 34638f887042..dbf9c08363fc 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -205,7 +205,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory(
+org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index b29e95484012..cefad038ddad 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -439,7 +439,7 @@ void FontHeightToolBoxControl::dispatchCommand(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory(
+com_sun_star_svx_FontHeightToolBoxController_get_implementation(
     css::uno::XComponentContext *rxContext,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 63ba43226d03..79e78785fb74 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -1050,7 +1050,7 @@ void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_FindTextToolboxController_implementation_getFactory(
+com_sun_star_svx_FindTextToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1061,7 +1061,7 @@ com_sun_star_svx_FindTextToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory(
+com_sun_star_svx_ExitFindbarToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1072,7 +1072,7 @@ com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_UpSearchToolboxController_implementation_getFactory(
+com_sun_star_svx_UpSearchToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1084,7 +1084,7 @@ com_sun_star_svx_UpSearchToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_DownSearchToolboxController_implementation_getFactory(
+com_sun_star_svx_DownSearchToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1096,7 +1096,7 @@ com_sun_star_svx_DownSearchToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory(
+com_sun_star_svx_MatchCaseToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1107,7 +1107,7 @@ com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_svx_FindAllToolboxController_implementation_getFactory(
+com_sun_star_svx_FindAllToolboxController_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1118,7 +1118,7 @@ com_sun_star_svx_FindAllToolboxController_implementation_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory(
+com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 93b280254052..9a21919750b2 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1281,7 +1281,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector )
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory(
+com_sun_star_comp_Draw_GraphicExporter_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 386762666977..1644601e76e3 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -420,7 +420,7 @@ void RecoveryUI::impl_showAllRecoveredDocs()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_svx_RecoveryUI_implementation_getFactory(
+com_sun_star_comp_svx_RecoveryUI_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index f30e6ae1b851..c1afe3db6dcf 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -191,7 +191,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasElements()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory(
+com_sun_star_drawing_SvxUnoColorTable_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 03377349a9bb..916d1f07a001 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -269,7 +269,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_drawing_SvxShapeCollection_implementation_getFactory(
+com_sun_star_drawing_SvxShapeCollection_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 39e502565c1d..2400573197be 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -249,7 +249,7 @@ void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName )
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory(
+com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 75bd29eab334..b95d38fdb0f6 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -1051,7 +1051,7 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServic
     SvXMLGraphicHelper
  */
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory(
+com_sun_star_comp_Svx_GraphicImportHelper_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
@@ -1075,7 +1075,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory(
     SvXMLGraphicHelper
  */
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory(
+com_sun_star_comp_Svx_GraphicExportHelper_get_implementation(
     SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
diff --git a/svx/util/svx.component b/svx/util/svx.component
index 848b28e433cf..8db99d97556b 100644
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -20,60 +20,60 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"
-      constructor="com_sun_star_comp_gallery_GalleryThemeProvider_implementation_getFactory">
+      constructor="com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation">
     <service name="com.sun.star.gallery.GalleryThemeProvider"/>
   </implementation>
   <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"
-      constructor="com_sun_star_comp_svx_Impl_FindbarDispatcher_implementation_getFactory">
+      constructor="com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation">
     <service name="com.sun.star.comp.svx.FindbarDispatcher"/>
     <service name="com.sun.star.frame.ProtocolHandler"/>
   </implementation>
   <implementation name="com.sun.star.comp.svx.RecoveryUI"
-      constructor="com_sun_star_comp_svx_RecoveryUI_implementation_getFactory">
+      constructor="com_sun_star_comp_svx_RecoveryUI_get_implementation">
     <service name="com.sun.star.dialog.RecoveryUI"/>
   </implementation>
   <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"
-      constructor="com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory">
+      constructor="com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation">
     <service name="com.sun.star.drawing.CustomShapeEngine"/>
   </implementation>
   <implementation name="com.sun.star.drawing.SvxShapeCollection"
-      constructor="com_sun_star_drawing_SvxShapeCollection_implementation_getFactory">
+      constructor="com_sun_star_drawing_SvxShapeCollection_get_implementation">
     <service name="com.sun.star.drawing.ShapeCollection"/>
   </implementation>
   <implementation name="com.sun.star.drawing.SvxUnoColorTable"
-      constructor="com_sun_star_drawing_SvxUnoColorTable_implementation_getFactory">
+      constructor="com_sun_star_drawing_SvxUnoColorTable_get_implementation">
     <service name="com.sun.star.drawing.ColorTable"/>
   </implementation>
   <implementation name="com.sun.star.svx.DownSearchToolboxController"
-      constructor="com_sun_star_svx_DownSearchToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_DownSearchToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.FindTextToolboxController"
-      constructor="com_sun_star_svx_FindTextToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_FindTextToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.MatchCaseToolboxController"
-      constructor="com_sun_star_svx_MatchCaseToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_MatchCaseToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.FindAllToolboxController"
-      constructor="com_sun_star_svx_FindAllToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_FindAllToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.FontHeightToolBoxController"
-      constructor="com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory">
+      constructor="com_sun_star_svx_FontHeightToolBoxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.UpSearchToolboxController"
-      constructor="com_sun_star_svx_UpSearchToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_UpSearchToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.svx.ExitFindbarToolboxController"
-      constructor="com_sun_star_svx_ExitFindbarToolboxController_implementation_getFactory">
+      constructor="com_sun_star_svx_ExitFindbarToolboxController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="org.apache.openoffice.comp.svx.sidebar.PanelFactory"
-      constructor="org_apache_openoffice_comp_svx_sidebar_PanelFactory_implementation_getFactory">
+      constructor="org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation">
     <service name="com.sun.star.ui.UIElementFactory"/>
   </implementation>
 </component>
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 5555c2a88b10..1e6d1c7ef793 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -19,7 +19,7 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     prefix="svxcore" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Draw.GraphicExporter"
-      constructor="com_sun_star_comp_Draw_GraphicExporter_implementation_getFactory">
+      constructor="com_sun_star_comp_Draw_GraphicExporter_get_implementation">
     <service name="com.sun.star.drawing.GraphicExportFilter"/>
   </implementation>
   <implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
@@ -41,17 +41,17 @@
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
   <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"
-      constructor="com_sun_star_comp_Svx_GraphicExportHelper_implementation_getFactory">
+      constructor="com_sun_star_comp_Svx_GraphicExportHelper_get_implementation">
     <service name="com.sun.star.document.BinaryStreamResolver"/>
     <service name="com.sun.star.document.GraphicObjectResolver"/>
   </implementation>
   <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"
-      constructor="com_sun_star_comp_Svx_GraphicImportHelper_implementation_getFactory">
+      constructor="com_sun_star_comp_Svx_GraphicImportHelper_get_implementation">
     <service name="com.sun.star.document.BinaryStreamResolver"/>
     <service name="com.sun.star.document.GraphicObjectResolver"/>
   </implementation>
   <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"
-      constructor="com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory">
+      constructor="com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation">
     <service name="com.sun.star.graphic.PrimitiveFactory2D"/>
   </implementation>
 </component>