diff --git a/sigil/common/core.tests/.classpath b/sigil/common/core.tests/.classpath
index 2503159..c9ffd60 100644
--- a/sigil/common/core.tests/.classpath
+++ b/sigil/common/core.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/core.tests/.project b/sigil/common/core.tests/.project
index 4d0faea..60d4d6d 100644
--- a/sigil/common/core.tests/.project
+++ b/sigil/common/core.tests/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/common/core/.classpath b/sigil/common/core/.classpath
index 2503159..c9ffd60 100644
--- a/sigil/common/core/.classpath
+++ b/sigil/common/core/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/core/.project b/sigil/common/core/.project
index 08f3aa5..b7701c6 100644
--- a/sigil/common/core/.project
+++ b/sigil/common/core/.project
@@ -11,14 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/common/junit/.classpath b/sigil/common/junit/.classpath
index 2503159..c9ffd60 100644
--- a/sigil/common/junit/.classpath
+++ b/sigil/common/junit/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/junit/.project b/sigil/common/junit/.project
index cf53427..aebb4f6 100644
--- a/sigil/common/junit/.project
+++ b/sigil/common/junit/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/common/obr/.classpath b/sigil/common/obr/.classpath
index 094b74d..427e30f 100644
--- a/sigil/common/obr/.classpath
+++ b/sigil/common/obr/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/obr/.project b/sigil/common/obr/.project
index c77953d..2576901 100644
--- a/sigil/common/obr/.project
+++ b/sigil/common/obr/.project
@@ -11,14 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/core.feature/.project b/sigil/eclipse/core.feature/.project
index e6521d5..6160bf9 100644
--- a/sigil/eclipse/core.feature/.project
+++ b/sigil/eclipse/core.feature/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-                <nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/core/.classpath b/sigil/eclipse/core/.classpath
index de1c4df..b644560 100644
--- a/sigil/eclipse/core/.classpath
+++ b/sigil/eclipse/core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
diff --git a/sigil/eclipse/core/.project b/sigil/eclipse/core/.project
index a7c7b9f..f5e965d 100644
--- a/sigil/eclipse/core/.project
+++ b/sigil/eclipse/core/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/help/.classpath b/sigil/eclipse/help/.classpath
index df7c8de..41d4818 100644
--- a/sigil/eclipse/help/.classpath
+++ b/sigil/eclipse/help/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/help/.project b/sigil/eclipse/help/.project
index 1aba953..2688c0c 100644
--- a/sigil/eclipse/help/.project
+++ b/sigil/eclipse/help/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/obr/.classpath b/sigil/eclipse/obr/.classpath
index 7f0e71c..aee728a 100644
--- a/sigil/eclipse/obr/.classpath
+++ b/sigil/eclipse/obr/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
diff --git a/sigil/eclipse/obr/.project b/sigil/eclipse/obr/.project
index 079b440..f534dee 100644
--- a/sigil/eclipse/obr/.project
+++ b/sigil/eclipse/obr/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/search/.classpath b/sigil/eclipse/search/.classpath
index 2fb4479..735b84e 100644
--- a/sigil/eclipse/search/.classpath
+++ b/sigil/eclipse/search/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="lib" path="lib/bcel.jar"/>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/search/.project b/sigil/eclipse/search/.project
index ab0496f..bbe43a8 100644
--- a/sigil/eclipse/search/.project
+++ b/sigil/eclipse/search/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/ui/.classpath b/sigil/eclipse/ui/.classpath
index 03621b5..fce9fdb 100644
--- a/sigil/eclipse/ui/.classpath
+++ b/sigil/eclipse/ui/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/ui/.project b/sigil/eclipse/ui/.project
index 8dbab11..35b56c2 100644
--- a/sigil/eclipse/ui/.project
+++ b/sigil/eclipse/ui/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/eclipse/utils/.classpath b/sigil/eclipse/utils/.classpath
index 94b23e1..53669fa 100644
--- a/sigil/eclipse/utils/.classpath
+++ b/sigil/eclipse/utils/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<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="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/utils/.project b/sigil/eclipse/utils/.project
index 94d95fe..c3ac20d 100644
--- a/sigil/eclipse/utils/.project
+++ b/sigil/eclipse/utils/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>
diff --git a/sigil/ivy/resolver/.classpath b/sigil/ivy/resolver/.classpath
index 703cfcf..df01fbf 100644
--- a/sigil/ivy/resolver/.classpath
+++ b/sigil/ivy/resolver/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.apache.felix.sigil.common.core"/>
-	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/ivy/resolver/.project b/sigil/ivy/resolver/.project
index b6ab63d..63efc3a 100644
--- a/sigil/ivy/resolver/.project
+++ b/sigil/ivy/resolver/.project
@@ -11,13 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.cauldron.sigil.core.newtonBuilder</name>
+			<name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.apache.felix.sigil.sigilnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.cauldron.sigil.core.newtonnature</nature>
 	</natures>
 </projectDescription>