diff --git a/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.properties b/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.properties
index c0e0b1c033682f7b7225cb244fa9074710fb196a..91ae328624e8b805efc0ebba1c9628ba212f140f 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.properties
@@ -26,7 +26,8 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_adaptation_category = Adaptation
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
diff --git a/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.xml b/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.xml
index a9100f00dcf6eb0923b07ab9cb2a070d45cb3aa4..40591aec2aecfde7530af7d54698f2a724afe862 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.adaptation.editor/plugin.xml
@@ -9,13 +9,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.adaptation.category"
+            name="%_UI_Wizard_adaptation_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.adaptation.presentation.AdaptationModelWizardID"
             name="%_UI_AdaptationModelWizard_label"
             class="edu.kit.ipd.descartes.mm.adaptation.presentation.AdaptationModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.adaptation.category"
             icon="icons/full/obj16/AdaptationModelFile.gif">
          <description>%_UI_AdaptationModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.properties b/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.properties
index 9bcc6b9eb401a9b250d286ea6f5db8a93edb2f64..dc88c79c9ab010894336240e6ea16a98a8b4739d 100644
--- a/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.properties
@@ -3,7 +3,7 @@
 pluginName = Adaptationpoints Editor
 providerName = www.example.org
 
-_UI_AdaptationpointsEditor_menu = &Adaptationpoints Editor
+_UI_AdaptationpointsEditor_menu = &Adaptation Points Editor
 
 _UI_CreateChild_menu_item = &New Child
 _UI_CreateSibling_menu_item = N&ew Sibling
@@ -26,14 +26,15 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_adaptation_category = Adaptation
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
-_UI_AdaptationpointsModelWizard_label = Adaptationpoints Model
-_UI_AdaptationpointsModelWizard_description = Create a new Adaptationpoints model
+_UI_AdaptationpointsModelWizard_label = Adaptation Points Model
+_UI_AdaptationpointsModelWizard_description = Create a new Adaptation Points model
 
-_UI_AdaptationpointsEditor_label = Adaptationpoints Model Editor
+_UI_AdaptationpointsEditor_label = Adaptation Points Model Editor
 
 _UI_AdaptationpointsEditorFilenameDefaultBase = My
 _UI_AdaptationpointsEditorFilenameExtensions = adaptationpoints
diff --git a/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.xml b/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.xml
index 9dcaa01270e73489e05d5b635b388fedee26c946..e0c5b7725c6853a35d2663c411bf7a1f8bef2fea 100644
--- a/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.adaptationpoints.editor/plugin.xml
@@ -9,13 +9,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.adaptation.category"
+            name="%_UI_Wizard_adaptation_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.adaptationpoints.presentation.AdaptationpointsModelWizardID"
             name="%_UI_AdaptationpointsModelWizard_label"
             class="edu.kit.ipd.descartes.mm.adaptationpoints.presentation.AdaptationpointsModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.adaptation.category"
             icon="icons/full/obj16/AdaptationpointsModelFile.gif">
          <description>%_UI_AdaptationpointsModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.properties b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.properties
index fea392032573b37dc96c8cb837ca015d63b3b5d0..e5e0f7c50180619a53d56986fa92d43636de8a8b 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.properties
@@ -30,7 +30,9 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_repository_category = Component Registry
+_UI_Wizard_assembly_category = Component Assembly
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
@@ -42,10 +44,10 @@ _UI_FunctionsEditor_label = Functions Model Editor
 _UI_FunctionsEditorFilenameDefaultBase = My
 _UI_FunctionsEditorFilenameExtensions = functions
 
-_UI_ParameterdependenciesModelWizard_label = Parameterdependencies Model
-_UI_ParameterdependenciesModelWizard_description = Create a new Parameterdependencies model
+_UI_ParameterdependenciesModelWizard_label = Parameter Dependencies Model
+_UI_ParameterdependenciesModelWizard_description = Create a new Parameter Dependencies model
 
-_UI_ParameterdependenciesEditor_label = Parameterdependencies Model Editor
+_UI_ParameterdependenciesEditor_label = Parameter Dependencies Model Editor
 
 _UI_ParameterdependenciesEditorFilenameDefaultBase = My
 _UI_ParameterdependenciesEditorFilenameExtensions = parameterdependencies
@@ -58,10 +60,10 @@ _UI_RepositoryEditor_label = Repository Model Editor
 _UI_RepositoryEditorFilenameDefaultBase = My
 _UI_RepositoryEditorFilenameExtensions = repository
 
-_UI_ServicebehaviorModelWizard_label = Servicebehavior Model
-_UI_ServicebehaviorModelWizard_description = Create a new Servicebehavior model
+_UI_ServicebehaviorModelWizard_label = Service Behavior Model
+_UI_ServicebehaviorModelWizard_description = Create a new Service Behavior model
 
-_UI_ServicebehaviorEditor_label = Servicebehavior Model Editor
+_UI_ServicebehaviorEditor_label = Service Behavior Model Editor
 
 _UI_ServicebehaviorEditorFilenameDefaultBase = My
 _UI_ServicebehaviorEditorFilenameExtensions = servicebehavior
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
index a0fa85b4c6eecf848b250dd4e990a18b262cc1cd..92e7d9386e5ac34ee41431ab38044924eac079e9 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
@@ -7,21 +7,25 @@
 
 <plugin>
 
-   <extension point="org.eclipse.ui.newWizards">
-      <!-- @generated applicationlevel -->
+<!--   <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.repository.category"
+            name="%_UI_Wizard_repository_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsModelWizardID"
             name="%_UI_FunctionsModelWizard_label"
             class="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.repository.category"
             icon="icons/full/obj16/FunctionsModelFile.gif">
          <description>%_UI_FunctionsModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
-   </extension>
+   </extension>-->
 
    <extension point="org.eclipse.ui.editors">
       <!-- @generated applicationlevel -->
@@ -35,21 +39,25 @@
       </editor>
    </extension>
 
-   <extension point="org.eclipse.ui.newWizards">
-      <!-- @generated applicationlevel -->
+<!--<extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.repository.category"
+            name="%_UI_Wizard_repository_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesModelWizardID"
             name="%_UI_ParameterdependenciesModelWizard_label"
             class="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.repository.category"
             icon="icons/full/obj16/ParameterdependenciesModelFile.gif">
          <description>%_UI_ParameterdependenciesModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
-   </extension>
+   </extension>-->
 
    <extension point="org.eclipse.ui.editors">
       <!-- @generated applicationlevel -->
@@ -66,13 +74,18 @@
    <extension point="org.eclipse.ui.newWizards">
       <!-- @generated applicationlevel -->
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.repository.category"
+            name="%_UI_Wizard_repository_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryModelWizardID"
             name="%_UI_RepositoryModelWizard_label"
             class="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.repository.category"
             icon="icons/full/obj16/RepositoryModelFile.gif">
          <description>%_UI_RepositoryModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
@@ -91,21 +104,25 @@
       </editor>
    </extension>
 
-   <extension point="org.eclipse.ui.newWizards">
-      <!-- @generated applicationlevel -->
+<!--   <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.repository.category"
+            name="%_UI_Wizard_repository_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorModelWizardID"
             name="%_UI_ServicebehaviorModelWizard_label"
             class="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.repository.category"
             icon="icons/full/obj16/ServicebehaviorModelFile.gif">
          <description>%_UI_ServicebehaviorModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
-   </extension>
+   </extension>-->
 
    <extension point="org.eclipse.ui.editors">
       <!-- @generated applicationlevel -->
@@ -122,13 +139,18 @@
    <extension point="org.eclipse.ui.newWizards">
       <!-- @generated applicationlevel -->
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.assembly.category"
+            name="%_UI_Wizard_assembly_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemModelWizardID"
             name="%_UI_SystemModelWizard_label"
             class="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.assembly.category"
             icon="icons/full/obj16/SystemModelFile.gif">
          <description>%_UI_SystemModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/plugin.properties b/edu.kit.ipd.descartes.mm.deployment.editor/plugin.properties
index 430b1ba2d106759f54d6847fb60c59c3b157df94..a0d638660912923643f6918dbd1b4757f04cbc28 100644
--- a/edu.kit.ipd.descartes.mm.deployment.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.deployment.editor/plugin.properties
@@ -26,7 +26,8 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_deployment_category = System Deployment
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
diff --git a/edu.kit.ipd.descartes.mm.deployment.editor/plugin.xml b/edu.kit.ipd.descartes.mm.deployment.editor/plugin.xml
index d4da1161439fdef5e421f6504092a8e9b91562f9..c306bb4db18a87ef7e15c5dd50343ebec5e15938 100644
--- a/edu.kit.ipd.descartes.mm.deployment.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.deployment.editor/plugin.xml
@@ -9,13 +9,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.deployment.category"
+            name="%_UI_Wizard_deployment_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.deployment.presentation.DeploymentModelWizardID"
             name="%_UI_DeploymentModelWizard_label"
             class="edu.kit.ipd.descartes.mm.deployment.presentation.DeploymentModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.deployment.category"
             icon="icons/full/obj16/DeploymentModelFile.gif">
          <description>%_UI_DeploymentModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.properties b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.properties
index 44240d2c0e46fcfb05f839333d62bf5a73c1926e..008e5d5ac480cf6bbad7b51ec85b42c9d5986708 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.properties
@@ -3,10 +3,10 @@
 pluginName = Resourcelandscape Editor
 providerName = www.example.org
 
-_UI_ResourcelandscapeEditor_menu = &Resourcelandscape Editor
-_UI_ResourceconfigurationEditor_menu = &Resourceconfiguration Editor
-_UI_ContainerrepositoryEditor_menu = &Containerrepository Editor
-_UI_RuntimeenvironmentclassesEditor_menu = &Runtimeenvironmentclasses Editor
+_UI_ResourcelandscapeEditor_menu = &Resource Landscape Editor
+_UI_ResourceconfigurationEditor_menu = &Resource Configuration Editor
+_UI_ContainerrepositoryEditor_menu = &Container Repository Editor
+_UI_RuntimeenvironmentclassesEditor_menu = &Runtime Environment Classes Editor
 _UI_ParameterEditor_menu = &Parameter Editor
 
 _UI_CreateChild_menu_item = &New Child
@@ -30,38 +30,39 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_resourcelandscape_category = Resource Landscape
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
-_UI_ResourcelandscapeModelWizard_label = Resourcelandscape Model
-_UI_ResourcelandscapeModelWizard_description = Create a new Resourcelandscape model
+_UI_ResourcelandscapeModelWizard_label = Resource Landscape Model
+_UI_ResourcelandscapeModelWizard_description = Create a new Resource Landscape model
 
-_UI_ResourcelandscapeEditor_label = Resourcelandscape Model Editor
+_UI_ResourcelandscapeEditor_label = Resource Landscape Model Editor
 
 _UI_ResourcelandscapeEditorFilenameDefaultBase = My
 _UI_ResourcelandscapeEditorFilenameExtensions = resourcelandscape
 
-_UI_ResourceconfigurationModelWizard_label = Resourceconfiguration Model
-_UI_ResourceconfigurationModelWizard_description = Create a new Resourceconfiguration model
+_UI_ResourceconfigurationModelWizard_label = Resource Configuration Model
+_UI_ResourceconfigurationModelWizard_description = Create a new Resource Configuration model
 
-_UI_ResourceconfigurationEditor_label = Resourceconfiguration Model Editor
+_UI_ResourceconfigurationEditor_label = Resource Configuration Model Editor
 
 _UI_ResourceconfigurationEditorFilenameDefaultBase = My
 _UI_ResourceconfigurationEditorFilenameExtensions = resourceconfiguration
 
-_UI_ContainerrepositoryModelWizard_label = Containerrepository Model
-_UI_ContainerrepositoryModelWizard_description = Create a new Containerrepository model
+_UI_ContainerrepositoryModelWizard_label = Container Repository Model
+_UI_ContainerrepositoryModelWizard_description = Create a new Container Repository model
 
-_UI_ContainerrepositoryEditor_label = Containerrepository Model Editor
+_UI_ContainerrepositoryEditor_label = Container Repository Model Editor
 
 _UI_ContainerrepositoryEditorFilenameDefaultBase = My
 _UI_ContainerrepositoryEditorFilenameExtensions = containerrepository
 
-_UI_RuntimeenvironmentclassesModelWizard_label = Runtimeenvironmentclasses Model
-_UI_RuntimeenvironmentclassesModelWizard_description = Create a new Runtimeenvironmentclasses model
+_UI_RuntimeenvironmentclassesModelWizard_label = Runtime Environment Classes Model
+_UI_RuntimeenvironmentclassesModelWizard_description = Create a new Runtime Environment Classes model
 
-_UI_RuntimeenvironmentclassesEditor_label = Runtimeenvironmentclasses Model Editor
+_UI_RuntimeenvironmentclassesEditor_label = Runtime Environment Classes Model Editor
 
 _UI_RuntimeenvironmentclassesEditorFilenameDefaultBase = My
 _UI_RuntimeenvironmentclassesEditorFilenameExtensions = runtimeenvironmentclasses
@@ -87,9 +88,9 @@ _UI_Wizard_initial_object_description = Select a model object to create
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
-_UI_ResourcetypeEditor_menu = &Resourcetype Editor
-_UI_ResourcetypeModelWizard_label = Resourcetype Model
-_UI_ResourcetypeModelWizard_description = Create a new Resourcetype model
-_UI_ResourcetypeEditor_label = Resourcetype Model Editor
+_UI_ResourcetypeEditor_menu = &Resource Type Editor
+_UI_ResourcetypeModelWizard_label = Resource Type Model
+_UI_ResourcetypeModelWizard_description = Create a new Resource Type model
+_UI_ResourcetypeEditor_label = Resource Type Model Editor
 _UI_ResourcetypeEditorFilenameDefaultBase = My
 _UI_ResourcetypeEditorFilenameExtensions = resourcetype
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
index aba9c2d656dcce4dea7f0b7f432bfa72404f63c2..1bf0f47760806f57fc7ecc618f2ebe2f64149f5e 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml
@@ -9,13 +9,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.resourcelandscape.category"
+            name="%_UI_Wizard_resourcelandscape_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.resourcelandscape.presentation.ResourcelandscapeModelWizardID"
             name="%_UI_ResourcelandscapeModelWizard_label"
             class="edu.kit.ipd.descartes.mm.resourcelandscape.presentation.ResourcelandscapeModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.resourcelandscape.category"
             icon="icons/full/obj16/ResourcelandscapeModelFile.gif">
          <description>%_UI_ResourcelandscapeModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
@@ -33,20 +38,25 @@
       </editor>
    </extension>
 
-   <extension point="org.eclipse.ui.newWizards">
+<!--   <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.resourcelandscape.category"
+            name="%_UI_Wizard_resourcelandscape_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.resourceconfiguration.presentation.ResourceconfigurationModelWizardID"
             name="%_UI_ResourceconfigurationModelWizard_label"
             class="edu.kit.ipd.descartes.mm.resourceconfiguration.presentation.ResourceconfigurationModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.resourcelandscape.category"
             icon="icons/full/obj16/ResourceconfigurationModelFile.gif">
          <description>%_UI_ResourceconfigurationModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
-   </extension>
+   </extension>-->
 
    <extension point="org.eclipse.ui.editors">
       <editor
@@ -61,13 +71,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.resourcelandscape.category"
+            name="%_UI_Wizard_resourcelandscape_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.containerrepository.presentation.ContainerrepositoryModelWizardID"
             name="%_UI_ContainerrepositoryModelWizard_label"
             class="edu.kit.ipd.descartes.mm.containerrepository.presentation.ContainerrepositoryModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.resourcelandscape.category"
             icon="icons/full/obj16/ContainerrepositoryModelFile.gif">
          <description>%_UI_ContainerrepositoryModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
@@ -87,13 +102,18 @@
 
    <extension point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.resourcelandscape.category"
+            name="%_UI_Wizard_resourcelandscape_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeModelWizardID"
             name="%_UI_ResourcetypeModelWizard_label"
             class="edu.kit.ipd.descartes.mm.resourcetype.presentation.ResourcetypeModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.resourcelandscape.category"
             icon="icons/full/obj16/ResourcetypeModelFile.gif">
          <description>%_UI_ResourcetypeModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.properties b/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.properties
index fc9e8c01816fa9105ce9d3e5a0b6517e81e215f0..474cfdee495da0e8a0753f27db2059d83932c2a6 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.properties
+++ b/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.properties
@@ -3,7 +3,7 @@
 pluginName = UsageProfile Editor
 providerName = www.example.org
 
-_UI_UsageProfileEditor_menu = &UsageProfile Editor
+_UI_UsageProfileEditor_menu = &Usage Profile Editor
 
 _UI_CreateChild_menu_item = &New Child
 _UI_CreateSibling_menu_item = N&ew Sibling
@@ -26,14 +26,15 @@ _UI_MultiObjectSelected = Selected {0} Objects
 
 _UI_OpenEditorError_label = Open Editor
 
-_UI_Wizard_category = Example EMF Model Creation Wizards
+_UI_Wizard_category = DML
+_UI_Wizard_usageprofile_category = Usage Profile
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
-_UI_UsageProfileModelWizard_label = UsageProfile Model
-_UI_UsageProfileModelWizard_description = Create a new UsageProfile model
+_UI_UsageProfileModelWizard_label = Usage Profile Model
+_UI_UsageProfileModelWizard_description = Create a new Usage Profile model
 
-_UI_UsageProfileEditor_label = UsageProfile Model Editor
+_UI_UsageProfileEditor_label = Usage Profile Model Editor
 
 _UI_UsageProfileEditorFilenameDefaultBase = My
 _UI_UsageProfileEditorFilenameExtensions = usageprofile
diff --git a/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.xml b/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.xml
index 10a8d2f18e95f51fea55b9d736a295560547a99e..a5c7897ba2a769d4e4c627b96f7f68363e8c4ec1 100644
--- a/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.usageprofile.editor/plugin.xml
@@ -10,13 +10,18 @@
    <extension point="org.eclipse.ui.newWizards">
       <!-- @generated usageprofile -->
       <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            id="tools.descartes.dml.category"
             name="%_UI_Wizard_category"/>
+      <category
+            id="tools.descartes.dml.usageprofile.category"
+            name="%_UI_Wizard_usageprofile_category"
+            parentCategory="tools.descartes.dml.category">
+      </category>
       <wizard
             id="edu.kit.ipd.descartes.mm.usageprofile.presentation.UsageProfileModelWizardID"
             name="%_UI_UsageProfileModelWizard_label"
             class="edu.kit.ipd.descartes.mm.usageprofile.presentation.UsageProfileModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            category="tools.descartes.dml.category/tools.descartes.dml.usageprofile.category"
             icon="icons/full/obj16/UsageProfileModelFile.gif">
          <description>%_UI_UsageProfileModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>