diff --git a/org.apache.felix.shell.gui.plugin/pom.xml b/org.apache.felix.shell.gui.plugin/pom.xml
index 121e833..04374b1 100644
--- a/org.apache.felix.shell.gui.plugin/pom.xml
+++ b/org.apache.felix.shell.gui.plugin/pom.xml
@@ -45,11 +45,11 @@
           <osgiManifest>
             <bundleName>ShellGUIPlugin</bundleName>
             <bundleDescription>A simple set of plugins for the ShellGUI bundle.</bundleDescription>
-            <bundleActivator>org.apache.felix.shell.gui.plugin.Activator</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/shellguiplugin/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/shellguiplugin/org.apache.felix.shell.gui.plugin.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/shellguiplugin/org.apache.felix.shell.gui.plugin-src.jar</bundleSource>
-            <bundleSymbolicName>org.apache.felix.shell.gui.plugin</bundleSymbolicName>
+            <bundleActivator>${pom.artifactId}.Activator</bundleActivator>
+            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
+            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
+            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
+            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
             <importPackage>org.osgi.framework,javax.swing,javax.swing.event,javax.swing.table,javax.swing.tree,javax.swing.border,javax.swing.text,org.apache.felix.shell,org.apache.felix.shell.gui,org.osgi.service.obr</importPackage>
             <exportService>org.apache.felix.shell.gui.Plugin</exportService>
             <importService>org.apache.felix.shell.ShellService,org.apache.felix.bundlerepository.RepostioryAdmin</importService>
diff --git a/org.apache.felix.shell.gui/pom.xml b/org.apache.felix.shell.gui/pom.xml
index 1399bfd..05d6530 100644
--- a/org.apache.felix.shell.gui/pom.xml
+++ b/org.apache.felix.shell.gui/pom.xml
@@ -27,13 +27,13 @@
           <osgiManifest>
             <bundleName>ShellGUI</bundleName>
             <bundleDescription>A simple plugin-oriented GUI shell.</bundleDescription>
-            <bundleActivator>org.apache.felix.shell.gui.impl.Activator</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/shellgui/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/shellgui/org.apache.felix.shell.gui.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/shellgui/org.apache.felix.shell.gui-src.jar</bundleSource>
-            <bundleSymbolicName>org.apache.felix.shell.gui</bundleSymbolicName>
+            <bundleActivator>${pom.artifactId}.impl.Activator</bundleActivator>
+            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
+            <bundleUrl>http://oscar-osgi.sf.net/obr2/shellgui/${pom.artifactId}-${pom.version}.jar</bundleUrl>
+            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
+            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
             <importPackage>org.osgi.framework,javax.swing,javax.swing.event</importPackage>
-            <exportPackage>org.apache.felix.shell.gui; specification-version="1.0.0"</exportPackage>
+            <exportPackage>${pom.artifactId}; specification-version="1.0.0"</exportPackage>
           </osgiManifest>
         </configuration>
       </plugin>