diff --git a/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java b/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java
index ab1b72f..366726a 100644
--- a/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java
+++ b/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java
@@ -37,6 +37,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import org.apache.felix.service.command.Descriptor;
+import org.apache.felix.service.command.Parameter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -44,8 +46,6 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Descriptor;
-import org.osgi.service.command.Parameter;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.log.LogService;
diff --git a/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java b/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
index ac445e5..d5960e6 100644
--- a/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
+++ b/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
@@ -23,9 +23,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Descriptor;
 import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Descriptor;
 
 public class Files
 {
diff --git a/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java b/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
index 2fd208c..4a437c7 100644
--- a/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
+++ b/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
@@ -29,9 +29,9 @@
 import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Resolver;
 import org.apache.felix.bundlerepository.Resource;
+import org.apache.felix.service.command.Descriptor;
+import org.apache.felix.service.command.Parameter;
 import org.osgi.framework.*;
-import org.osgi.service.command.Descriptor;
-import org.osgi.service.command.Parameter;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class OBR
diff --git a/gogo/runtime/pom.xml b/gogo/runtime/pom.xml
index e11c5a6..4125ac4 100644
--- a/gogo/runtime/pom.xml
+++ b/gogo/runtime/pom.xml
@@ -55,8 +55,8 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.osgi.service.command; version=${project.version},
-                            org.osgi.service.threadio; version=${project.version}
+                            org.apache.felix.service.command; version=${project.version},
+                            org.apache.felix.service.threadio; version=${project.version}
                         </Export-Package>
                         <Import-Package>
                             org.osgi.service.log*; resolution:=optional,
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
index 72cb58b..cd970f3 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
@@ -27,8 +27,8 @@
 import java.util.Map.Entry;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 
 public class Closure implements Function, Evaluate
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
index ca0e9cf..b41ca41 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
@@ -30,11 +30,11 @@
 import java.util.Map.Entry;
 
 import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.threadio.ThreadIO;
 
 public class CommandProcessorImpl implements CommandProcessor
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
index cf59c09..13400df 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import org.osgi.service.command.Function;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.BundleContext;
 
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
index 02982a2..13ff3c5 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
@@ -21,9 +21,9 @@
 // DWB10: add SCOPE support: https://www.osgi.org/bugzilla/show_bug.cgi?id=51
 package org.apache.felix.gogo.runtime;
 
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
index 2e3d8c1..81e57f4 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public class EOFError extends SyntaxError
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
index 333fa6c..1a54328 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public interface Evaluate
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
index 33a8f1c..4cd6585 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
@@ -25,7 +25,7 @@
 import java.io.PrintStream;
 import java.util.List;
 
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.Converter;
 
 public class Pipe extends Thread
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
index 9f86804..14a5e4c 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Parameter;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Parameter;
 
 public final class Reflective
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
index a53e47c..b359938 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public class SyntaxError extends RuntimeException
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
index c7b32d5..93320fe 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
index 930442b..25a7299 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
index 2e8246c..4deefb6 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
@@ -30,10 +30,10 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.threadio.ThreadIO;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
index c3bcd60..c4e2a12 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
@@ -19,7 +19,7 @@
 // DWB20: ThreadIO should check and reset IO if something (e.g. jetty) overrides
 package org.apache.felix.gogo.runtime.threadio;
 
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
similarity index 97%
rename from gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
index 64d8549..2d77053 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
similarity index 98%
rename from gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
index 4413008..6aad74f 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
similarity index 98%
rename from gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
index 14c5341..c13133a 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 /**
  * A converter is a service that can help create specific object types from a
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java
similarity index 96%
rename from gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java
index d38e878..bd57ac6 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/Function.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
similarity index 96%
rename from gogo/runtime/src/main/java/org/osgi/service/command/Function.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
index a282d80..d861cac 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.util.List;
 
diff --git a/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java b/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
similarity index 97%
rename from gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
index d9dc63c..cba6506 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java b/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
similarity index 97%
rename from gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
rename to gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
index 483e198..98e78e8 100644
--- a/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.threadio;
+package org.apache.felix.service.threadio;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
index a29266b..42ba180 100644
--- a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
+++ b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
@@ -18,10 +18,8 @@
  */
 package org.apache.felix.gogo.runtime;
 
-import org.apache.felix.gogo.runtime.CommandProcessorImpl;
-import org.apache.felix.gogo.runtime.CommandSessionImpl;
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
 
 public class Context extends CommandProcessorImpl
 {
diff --git a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
index e47d0a7..5f4268f 100644
--- a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
+++ b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
@@ -22,8 +22,8 @@
 
 import org.apache.felix.gogo.runtime.Parser;
 import org.apache.felix.gogo.runtime.Token;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
index 1d7dbd4..af47f6b 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
@@ -23,14 +23,13 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Set;
-
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator, Runnable
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
index f66a0ae..588baa2 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
@@ -42,8 +42,8 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
 
 /**
  * gosh built-in commands.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
index 6b0bca4..17d1c5f 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
@@ -21,9 +21,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
 
 public class Console implements Runnable
 {
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
index 55aa871..b76440a 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
@@ -30,8 +30,8 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
 import org.osgi.service.startlevel.StartLevel;
 
 public class Converters implements Converter
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
index 389dca7..39b8005 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
@@ -30,7 +30,7 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
 
 /**
  * Posix-like utilities.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
index 4821ef26..76bbee2 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
@@ -21,9 +21,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 
 public class Procedural
 {
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
index 8ca183d..3082a35 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
@@ -30,10 +30,10 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
 
 public class Shell
 {
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
index 1581d1e..c3acf6d 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
@@ -26,8 +26,8 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
 
 /*
  * a very simple Telnet server.