diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/plugin.xml b/BlueBerry/Bundles/org.blueberry.core.expressions/plugin.xml
index 417853bec7..2bb386d815 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/plugin.xml
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 
 <plugin>
-  <extension-point id="propertyTesters" name="Property Tester Extension-Point" schema="schema/propertyTesters.exsd"/>
-  <extension-point id="definitions" name="Defintions Extension-Point" schema="schema/definitions.exsd"/>
+  <extension-point id="org.blueberry.core.expressions.propertyTesters" name="Property Tester Extension-Point" schema="schema/propertyTesters.exsd"/>
+  <extension-point id="org.blueberry.core.expressions.definitions" name="Defintions Extension-Point" schema="schema/definitions.exsd"/>
 </plugin>
diff --git a/BlueBerry/Bundles/org.blueberry.ui/plugin.xml b/BlueBerry/Bundles/org.blueberry.ui/plugin.xml
index 6cec0307fd..fa4254ac04 100644
--- a/BlueBerry/Bundles/org.blueberry.ui/plugin.xml
+++ b/BlueBerry/Bundles/org.blueberry.ui/plugin.xml
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
-   <extension-point id="commands" name="Commands" schema="schema/commands.exsd"/>
-   <extension-point id="editors" name="Editors" schema="schema/editors.exsd"/>
-   <extension-point id="handlers" name="Handlers" schema="schema/handlers.exsd"/>
-   <extension-point id="intro" name="Introduction Extensions" schema="schema/intro.exsd"/>
-   <extension-point id="preferencePages" name="Preference Pages" schema="schema/preferencePages.exsd"/>
-   <extension-point id="views" name="Views" schema="schema/views.exsd"/>
-   <extension-point id="keywords" name="keywords" schema="schema/keywords.exsd"/>
-   <extension-point id="tweaklets" name="Tweaklets" schema="schema/tweaklets.exsd"/>
-   <extension-point id="perspectives" name="Perspectives" schema="schema/perspectives.exsd"/>
-   <extension-point id="presentationFactories" name="Presentation Factories" schema="schema/presentationFactories.exsd"/>
-   <extension-point id="services" name="Services" schema="schema/services.exsd"/>
+   <extension-point id="org.blueberry.ui.commands" name="Commands" schema="schema/commands.exsd"/>
+   <extension-point id="org.blueberry.ui.editors" name="Editors" schema="schema/editors.exsd"/>
+   <extension-point id="org.blueberry.ui.handlers" name="Handlers" schema="schema/handlers.exsd"/>
+   <extension-point id="org.blueberry.ui.intro" name="Introduction Extensions" schema="schema/intro.exsd"/>
+   <extension-point id="org.blueberry.ui.preferencePages" name="Preference Pages" schema="schema/preferencePages.exsd"/>
+   <extension-point id="org.blueberry.ui.views" name="Views" schema="schema/views.exsd"/>
+   <extension-point id="org.blueberry.ui.keywords" name="keywords" schema="schema/keywords.exsd"/>
+   <extension-point id="org.blueberry.ui.tweaklets" name="Tweaklets" schema="schema/tweaklets.exsd"/>
+   <extension-point id="org.blueberry.ui.perspectives" name="Perspectives" schema="schema/perspectives.exsd"/>
+   <extension-point id="org.blueberry.ui.presentationFactories" name="Presentation Factories" schema="schema/presentationFactories.exsd"/>
+   <extension-point id="org.blueberry.ui.services" name="Services" schema="schema/services.exsd"/>
    
    <extension
          point="org.eclipse.ui.services">
       <serviceFactory
             factoryClass="org.eclipse.ui.internal.WorkbenchSupportFactory">
          <service
                serviceClass="org.eclipse.ui.progress.IProgressService">
          </service>
          <service
                serviceClass="org.eclipse.ui.progress.IWorkbenchSiteProgressService">
          </service>
          <service
                serviceClass="org.eclipse.ui.IPartService">
          </service>
          <service
                serviceClass="org.eclipse.ui.IPageService">
          </service>
          <service
                serviceClass="org.eclipse.ui.ISelectionService">
          </service>
       </serviceFactory>
    </extension>
    
    <extension
      point="org.blueberry.ui.commands">
      <command
       name="Show View"
         description="Shows a particular view"
         id="org.blueberry.ui.views.showView"
         defaultHandler="berry::ShowViewHandler">
         <commandParameter
           id="org.eclipse.ui.views.showView.viewId"
           name="%command.showView.viewIdParameter"
           values="org.eclipse.ui.internal.registry.ViewParameterValues" />
     </command>
    </extension>
    
    <extension
          point="org.blueberry.ui.views">
       <category
             name="General"
             id="org.blueberry.ui"/>
       <view
             class="berry::ViewIntroAdapterPart"
             category="org.blueberry.ui"
             name="Welcome"
             id="org.blueberry.ui.internal.introview"/>
       <stickyView
             location="RIGHT"
             id="org.blueberry.ui.internal.introview"/>
    </extension>
    
    <extension
          point="org.blueberry.ui.editors">
       <editor
             class="berry::EditorIntroAdapterPart"
             name="Welcome"
             id="org.blueberry.ui.internal.introeditor">
       </editor>
    </extension>
-</plugin>
\ No newline at end of file
+</plugin>