diff --git a/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java b/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java
index 60476ee26d..9a0cb7017c 100644
--- a/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java
+++ b/h2gis-ext-osgi/src/main/java/org/h2gis/ext/osgi/Activator.java
@@ -42,7 +42,7 @@ public class Activator implements BundleActivator {
          * @throws Exception
          */
         @Override
-        public void start(BundleContext bc) throws Exception {                
+        public void start(BundleContext bc) throws Exception {
                 bc.registerService(DriverFunction.class, new DBFDriverFunction(), null);
                 bc.registerService(DriverFunction.class, new SHPDriverFunction(), null);
                 bc.registerService(DriverFunction.class, new GPXDriverFunction(), null);
diff --git a/h2gis-functions-osgi/pom.xml b/h2gis-functions-osgi/pom.xml
index 24b5c45014..ce8c07b7f0 100644
--- a/h2gis-functions-osgi/pom.xml
+++ b/h2gis-functions-osgi/pom.xml
@@ -25,7 +25,7 @@
 	<dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>h2gis-sfs</artifactId>
+            <artifactId>h2gis-functions</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -56,8 +56,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Private-Package>org.h2gis.sfs.osgi</Private-Package>
-                        <Bundle-Activator>org.h2gis.sfs.osgi.Activator</Bundle-Activator>
+                        <Private-Package>org.h2gis.functions.osgi</Private-Package>
+                        <Bundle-Activator>org.h2gis.functions.osgi.Activator</Bundle-Activator>
                         <Bundle-Vendor>CNRS</Bundle-Vendor>
                         <Bundle-Category>JDBC</Bundle-Category>
                     </instructions>
diff --git a/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/Activator.java b/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/Activator.java
index 45f08aeea9..2a4bcc0b74 100644
--- a/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/Activator.java
+++ b/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/Activator.java
@@ -28,7 +28,7 @@
 import org.osgi.util.tracker.ServiceTracker;
 
 import javax.sql.DataSource;
-import org.h2gis.functions.factory.H2GISFunctionsFactory;
+import org.h2gis.functions.factory.H2GISFunctions;
 
 /**
  * Publish H2GIS service on OSGi. Track for DataSource service, register spatial features into it.
@@ -40,7 +40,7 @@ public class Activator implements BundleActivator {
 
     @Override
     public void start(BundleContext bc) throws Exception {
-        for(Function function : H2GISFunctionsFactory.getBuiltInsFunctions()) {
+        for(Function function : H2GISFunctions.getBuiltInsFunctions()) {
             bc.registerService(Function.class,
                     function,
                     null);
diff --git a/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/FunctionTracker.java b/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/FunctionTracker.java
index c647070e96..0bdcbea356 100644
--- a/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/FunctionTracker.java
+++ b/h2gis-functions-osgi/src/main/java/org/h2gis/functions/osgi/FunctionTracker.java
@@ -24,7 +24,7 @@
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.h2gis.api.Function;
-import org.h2gis.functions.factory.H2GISFunctionsFactory;
+import org.h2gis.functions.factory.H2GISFunctions;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
@@ -63,7 +63,7 @@ public Function addingService(ServiceReference<Function> reference) {
             try {
                 Connection connection = dataSource.getConnection();
                 try {
-                    H2GISFunctionsFactory.registerFunction(connection.createStatement(), function, ""); //bundle.getSymbolicName() + ":" + bundle.getVersion().toString() + ":"
+                    H2GISFunctions.registerFunction(connection.createStatement(), function, ""); //bundle.getSymbolicName() + ":" + bundle.getVersion().toString() + ":"
                 } finally {
                     connection.close();
                 }
@@ -83,7 +83,7 @@ public void removedService(ServiceReference<Function> reference, Function servic
             try {
                 Connection connection = dataSource.getConnection();
                 try {
-                    H2GISFunctionsFactory.unRegisterFunction(connection.createStatement(), service);
+                    H2GISFunctions.unRegisterFunction(connection.createStatement(), service);
                 } finally {
                     connection.close();
                 }