diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/META-INF/MANIFEST.MF
index b989e37..ee24f30 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@
  org.eclipse.jdt.core,
  org.eclipse.test.performance,
  org.eclipse.objectteams.otdt.tests,
- org.objectteams.otequinox
+ org.eclipse.objectteams.otequinox
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml b/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
index 7ed74f1..40c5e85 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/plugin.xml
@@ -2,9 +2,9 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.objectteams.otequinox.aspectBindings">
+         point="org.eclipse.objectteams.otequinox.aspectBindings">
       <aspectBinding
-            icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
+            icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
          <basePlugin
                icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif"
                id="org.eclipse.jdt.core.tests.builder">
@@ -12,35 +12,7 @@
          <team
                activation="ALL_THREADS"
                class="org.eclipse.objectteams.otdt.test.builder.OTTestingEnvironment"
-               icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/team_obj.gif">
-         </team>
-      </aspectBinding>
-   </extension>
-   <extension
-         point="org.objectteams.otequinox.aspectBindings">
-      <aspectBinding
-            icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
-         <basePlugin
-               icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif"
-               id="org.eclipse.jdt.core.tests.builder">
-         </basePlugin>
-         <team
-               class="org.eclipse.objectteams.otdt.test.builder.OTTestingEnvironment"
-               icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/team_obj.gif">
-         </team>
-      </aspectBinding>
-   </extension>
-   <extension
-         point="org.objectteams.otequinox.aspectBindings">
-      <aspectBinding
-            icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
-         <basePlugin
-               icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif"
-               id="org.eclipse.jdt.core.tests.builder">
-         </basePlugin>
-         <team
-               class="org.eclipse.objectteams.otdt.test.builder.Team1"
-               icon="platform:/plugin/org.objectteams.otdt.ui/icons/ot/team_obj.gif">
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
       </aspectBinding>
    </extension>