diff --git a/sigil/eclipse/ui/plugin.xml b/sigil/eclipse/ui/plugin.xml
index 2c1d730..139a379 100644
--- a/sigil/eclipse/ui/plugin.xml
+++ b/sigil/eclipse/ui/plugin.xml
@@ -19,7 +19,7 @@
 -->
 <?eclipse version="3.2"?>
 <plugin>
-   <extension-point id="org.cauldron.sigil.ui.repositorywizard" name="Repository Wizard" schema="schema/org.cauldron.sigil.ui.repositorywizard.exsd"/>
+   <extension-point id="org.apache.felix.sigil.ui.repositorywizard" name="Repository Wizard" schema="schema/org.apache.felix.sigil.ui.repositorywizard.exsd"/>
       <extension
          point="org.eclipse.ui.startup">
       <startup class="org.apache.felix.sigil.ui.eclipse.startup.SigilStartup"/>
@@ -27,14 +27,14 @@
    <extension
          point="org.eclipse.ui.newWizards">
       <category
-            id="org.cauldron.sigil.newWizardCategory"
+            id="org.apache.felix.sigil.newWizardCategory"
             name="Sigil"/>
       <wizard
-            category="org.cauldron.sigil.newWizardCategory"
+            category="org.apache.felix.sigil.newWizardCategory"
             class="org.apache.felix.sigil.ui.eclipse.ui.wizard.project.SigilProjectWizard"
-            finalPerspective="org.cauldron.sigil.ui.perspective"
+            finalPerspective="org.apache.felix.sigil.ui.perspective"
             icon="etc/images/newton.png"
-            id="org.cauldron.sigil.editors.newProjectWizard"
+            id="org.apache.felix.sigil.editors.newProjectWizard"
             name="Sigil Project"
             project="true"/>
    </extension>
@@ -42,36 +42,36 @@
          point="org.eclipse.ui.preferencePages">
       <page
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.SigilPreferencePage"
-            id="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            id="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             name="Sigil"/>
       <!--page
-            category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
-            class="org.cauldron.sigil.ui.preferences.LibraryPreferencePage"
-            id="org.cauldron.sigil.ui.libraryPreferences"
+            category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
+            class="org.apache.felix.sigil.ui.preferences.LibraryPreferencePage"
+            id="org.apache.felix.sigil.ui.libraryPreferences"
             name="%librariesPrefsPage" >
       </page-->
       <page
-            category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.repository.RepositoriesPreferencePage"
-            id="org.cauldron.sigil.ui.preferences.repositoriesPreferencePage"
+            id="org.apache.felix.sigil.ui.preferences.repositoriesPreferencePage"
             name="%repositoriesPrefPage">
       </page>
       <page
-            category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.ExcludedResourcesPrefsPage"
-            id="org.cauldron.sigil.ui.preferences.excludedResources"
+            id="org.apache.felix.sigil.ui.preferences.excludedResources"
             name="Excluded Resources">
       </page>
       <page
-            category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.VersionsPreferencePage"
-            id="org.cauldron.sigil.ui.preferences.VersionsPreferencePage"
+            id="org.apache.felix.sigil.ui.preferences.VersionsPreferencePage"
             name="Version Handling">
       </page>
       <page
-            category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.installs.OSGiInstallsPreferencePage"
-            id="org.cauldron.sigil.ui.preferences.newtonInstalls"
+            id="org.apache.felix.sigil.ui.preferences.osgiInstalls"
             name="Newton Installs">
       </page>
    </extension>
@@ -82,19 +82,19 @@
             default="true"
             filenames="sigil.properties"
             icon="etc/images/newton.png"
-            id="org.cauldron.sigil.editors.SigilProjectEditor"
+            id="org.apache.felix.sigil.editors.SigilProjectEditor"
             name="Sigil Project Editor"/>
    </extension>
    <extension
          point="org.eclipse.jdt.core.classpathContainerInitializer">
       <classpathContainerInitializer
             class="org.apache.felix.sigil.ui.eclipse.classpath.SigilClasspathContainerInitializer"
-            id="org.cauldron.sigil.core.classpathContainer"/>
+            id="org.apache.felix.sigil.classpathContainer"/>
    </extension>
    <extension
          point="org.eclipse.jdt.ui.classpathContainerPage">
       <classpathContainerPage
-            class="org.apache.felix.sigil.ui.eclipse.classpath.SigilLibraryPage"        id="org.cauldron.sigil.core.classpathContainer"
+            class="org.apache.felix.sigil.ui.eclipse.classpath.SigilLibraryPage"        id="org.apache.felix.sigil.classpathContainer"
             name="Sigil Library"/>
    </extension>
    <extension
@@ -102,7 +102,7 @@
       <perspective
             class="org.apache.felix.sigil.ui.eclipse.ui.perspective.SigilPerspectiveFactory"
             icon="etc/images/newton.png"
-            id="org.cauldron.sigil.ui.perspective"
+            id="org.apache.felix.sigil.ui.perspective"
             name="Sigil">
       </perspective>
    </extension>
@@ -110,45 +110,45 @@
          point="org.eclipse.jdt.ui.quickFixProcessors">
       <quickFixProcessor
             class="org.apache.felix.sigil.ui.eclipse.ui.quickfix.ImportQuickFixProcessor"
-            id="org.cauldron.sigil.ui.quickFixProcessor1">
+            id="org.apache.felix.sigil.ui.importQuickFixProcessor">
       </quickFixProcessor>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <view
             allowMultiple="false"
-            category="org.cauldron.sigil.ui.views"
+            category="org.apache.felix.sigil.ui.views"
             class="org.apache.felix.sigil.ui.eclipse.ui.views.resolution.BundleResolverView"
             icon="icons/jar_web_obj.png"
-            id="org.cauldron.sigil.ui.bundleDependencyView"
+            id="org.apache.felix.sigil.ui.bundleDependencyView"
             name="Bundle Dependency View"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="org.cauldron.sigil.ui.views"
+            category="org.apache.felix.sigil.ui.views"
             class="org.apache.felix.sigil.ui.eclipse.ui.views.RepositoryViewPart"
             icon="icons/jars_obj.png"
-            id="org.cauldron.sigil.ui.repositoryBrowser"
+            id="org.apache.felix.sigil.ui.repositoryBrowser"
             name="Repository Browser"
             restorable="true">
       </view>
       <category
-            id="org.cauldron.sigil.ui.views"
+            id="org.apache.felix.sigil.ui.views"
             name="Sigil">
       </category>
    </extension>
    <extension
-         point="org.cauldron.sigil.ui.repositorywizard">
+         point="org.apache.felix.sigil.ui.repositorywizard">
       <wizard
             class="org.apache.felix.sigil.ui.eclipse.ui.internal.repository.FileSystemRepositoryWizard"
-            repository="org.cauldron.sigil.core.file">
+            repository="org.apache.felix.sigil.core.file">
       </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command
-            id="org.cauldron.sigil.ui.commands.renameComposite"
+            id="org.apache.felix.sigil.ui.commands.renameComposite"
             name="Rename Composite">
       </command>
    </extension>
@@ -156,18 +156,18 @@
          point="org.eclipse.ltk.core.refactoring.refactoringContributions">
       <contribution
             class="org.apache.felix.sigil.ui.eclipse.ui.refactor.RenameCompositeRefactoring"
-            id="org.cauldron.sigil.ui.rename.composite">
+            id="org.apache.felix.sigil.ui.rename.composite">
       </contribution>
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.project.ProjectPropertyPage"
-            id="org.cauldron.sigil.ui.projectpage"
+            id="org.apache.felix.sigil.ui.projectpage"
             name="Repositories">
          <filter
                name="projectNature"
-               value="org.cauldron.sigil.core.newtonnature"/>
+               value="org.apache.felix.sigil.sigilnature"/>
          <enabledWhen>
             <adapt
                   type="org.eclipse.core.resources.IProject">
@@ -183,7 +183,7 @@
                icon="etc/images/newton.png"
                label="Sigil">
             <command
-                  commandId="org.cauldron.sigil.ui.convertproject"
+                  commandId="org.apache.felix.sigil.ui.convertproject"
                   label="Convert Project"
                   style="push">
                <visibleWhen
@@ -192,11 +192,11 @@
             </command>
          </menu>
          <separator
-               name="org.cauldron.sigil.ui.separator"
+               name="org.apache.felix.sigil.ui.separator"
                visible="true">
          </separator>
          <command
-               commandId="org.cauldron.sigil.ui.refreshclasspath"
+               commandId="org.apache.felix.sigil.ui.refreshclasspath"
                icon="icons/refreshBundle.png"
                label="Refresh bundle classpath"
                style="push">
@@ -209,22 +209,22 @@
    <extension
          point="org.eclipse.ui.commands">
       <command
-            id="org.cauldron.sigil.ui.convertproject"
+            id="org.apache.felix.sigil.ui.convertproject"
             name="%commandConvertProject">
       </command>
       <command
-            id="org.cauldron.sigil.ui.refreshclasspath"
+            id="org.apache.felix.sigil.ui.refreshclasspath"
             name="%commandRefreshClasspath">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.commandImages">
       <image
-            commandId="org.cauldron.sigil.ui.convertproject"
+            commandId="org.apache.felix.sigil.ui.convertproject"
             icon="etc/images/newton.png">
       </image>
       <image
-            commandId="org.cauldron.sigil.ui.refreshclasspath"
+            commandId="org.apache.felix.sigil.ui.refreshclasspath"
             icon="etc/images/newton.png">
       </image>
    </extension>
@@ -233,7 +233,7 @@
          point="org.eclipse.ui.handlers">
       <handler
             class="org.apache.felix.sigil.ui.eclipse.handlers.project.ConvertProjectHandler"
-            commandId="org.cauldron.sigil.ui.convertproject">
+            commandId="org.apache.felix.sigil.ui.convertproject">
          <activeWhen>
             <with
                   variable="selection">
@@ -244,7 +244,7 @@
 	                           value="org.eclipse.core.resources.IProject">
 	                </instanceof>
 		            <test
-						property="org.cauldron.sigil.isSigilProject"
+						property="org.apache.felix.sigil.isSigilProject"
 						value="false">
 					</test>
                </iterate>
@@ -253,7 +253,7 @@
       </handler>      
       <handler
             class="org.apache.felix.sigil.ui.eclipse.handlers.project.RefreshSigilClasspathHandler"
-            commandId="org.cauldron.sigil.ui.refreshclasspath">
+            commandId="org.apache.felix.sigil.ui.refreshclasspath">
          <activeWhen>
             <with
                   variable="selection">
@@ -264,7 +264,7 @@
 	                           value="org.eclipse.core.resources.IProject">
 	                </instanceof>
 		            <test
-						property="org.cauldron.sigil.isSigilProject"
+						property="org.apache.felix.sigil.isSigilProject"
 						value="true">
 					</test>
                </iterate>