diff --git a/sigil/eclipse/core/.project b/sigil/eclipse/core/.project
index 71a8094..a7c7b9f 100644
--- a/sigil/eclipse/core/.project
+++ b/sigil/eclipse/core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.core</name>
+	<name>org.apache.felix.sigil.eclipse.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index bf1b4a0..e4f9409 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.core, \
+	org.apache.felix.sigil.eclipse.core, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/help/.classpath b/sigil/eclipse/help/.classpath
index d2c2949..94b23e1 100644
--- a/sigil/eclipse/help/.classpath
+++ b/sigil/eclipse/help/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/help/.project b/sigil/eclipse/help/.project
index 4ffe2a8..1aba953 100644
--- a/sigil/eclipse/help/.project
+++ b/sigil/eclipse/help/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.help</name>
+	<name>org.apache.felix.sigil.eclipse.help</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/help/sigil.properties b/sigil/eclipse/help/sigil.properties
index be1cbaa..f80ff55 100644
--- a/sigil/eclipse/help/sigil.properties
+++ b/sigil/eclipse/help/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.help, \
+	org.apache.felix.sigil.eclipse.help, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/obr/.classpath b/sigil/eclipse/obr/.classpath
index 7e9cc7e..d3b9691 100644
--- a/sigil/eclipse/obr/.classpath
+++ b/sigil/eclipse/obr/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/obr/.project b/sigil/eclipse/obr/.project
index b9b5088..079b440 100644
--- a/sigil/eclipse/obr/.project
+++ b/sigil/eclipse/obr/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.obr</name>
+	<name>org.apache.felix.sigil.eclipse.obr</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/obr/sigil.properties b/sigil/eclipse/obr/sigil.properties
index 6462115..2b9e2f6 100644
--- a/sigil/eclipse/obr/sigil.properties
+++ b/sigil/eclipse/obr/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.obr, \
+	org.apache.felix.sigil.eclipse.obr, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/search/.classpath b/sigil/eclipse/search/.classpath
index c151ef1..42d0967 100644
--- a/sigil/eclipse/search/.classpath
+++ b/sigil/eclipse/search/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/search/.project b/sigil/eclipse/search/.project
index 929ddaf..ab0496f 100644
--- a/sigil/eclipse/search/.project
+++ b/sigil/eclipse/search/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.search</name>
+	<name>org.apache.felix.sigil.eclipse.search</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/search/sigil.properties b/sigil/eclipse/search/sigil.properties
index d0de4f7..650e652 100644
--- a/sigil/eclipse/search/sigil.properties
+++ b/sigil/eclipse/search/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.search, \
+	org.apache.felix.sigil.eclipse.search, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/ui/.classpath b/sigil/eclipse/ui/.classpath
index 8be1017..2503159 100644
--- a/sigil/eclipse/ui/.classpath
+++ b/sigil/eclipse/ui/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/ui/.project b/sigil/eclipse/ui/.project
index a8b1291..8dbab11 100644
--- a/sigil/eclipse/ui/.project
+++ b/sigil/eclipse/ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.ui</name>
+	<name>org.apache.felix.sigil.eclipse.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index 9c2e20e..5c6d362 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.ui, \
+	org.apache.felix.sigil.eclipse.ui, \
 
 -sourcedirs: \
 	src, \
diff --git a/sigil/eclipse/utils/.classpath b/sigil/eclipse/utils/.classpath
index d2c2949..94b23e1 100644
--- a/sigil/eclipse/utils/.classpath
+++ b/sigil/eclipse/utils/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/utils/.project b/sigil/eclipse/utils/.project
index c5cd0b2..94d95fe 100644
--- a/sigil/eclipse/utils/.project
+++ b/sigil/eclipse/utils/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.cauldron.sigil.utils</name>
+	<name>org.apache.felix.sigil.eclipse.utils</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/sigil/eclipse/utils/sigil.properties b/sigil/eclipse/utils/sigil.properties
index eb67c6c..0e28fc8 100644
--- a/sigil/eclipse/utils/sigil.properties
+++ b/sigil/eclipse/utils/sigil.properties
@@ -4,7 +4,7 @@
 version: 0.0.0
 
 -bundles: \
-	org.cauldron.sigil.utils, \
+	org.apache.felix.sigil.eclipse.utils, \
 
 -sourcedirs: \
 	src, \