3 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx
index 112a5d5411fa..1b4faf6f26da 100644
--- a/connectivity/source/drivers/firebird/FDriver.cxx
+++ b/connectivity/source/drivers/firebird/FDriver.cxx
@@ -89,7 +89,7 @@ void FirebirdDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString FirebirdDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.FirebirdDriver");
+    return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver");
         // this name is referenced in the configuration and in the firebird.xml
         // Please take care when changing it.
 }
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx
index 9cc8197e84c0..42f34c538c5a 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -118,7 +118,7 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* pRegistryKey)
diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component
index 2624f2e7b00b..ea4e4de2cfe2 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/connectivity/source/drivers/firebird/firebird_sdbc.component
@@ -8,9 +8,10 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.sdbc.FirebirdDriver">
+  <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
 </component>
+