Camel case names for model files genmodel prefix

92c8b79f · Kai-Holger Brassel · fa0d7069 · 92c8b79f · 92c8b79f · 92c8b79f
Commit 92c8b79f authored 4 years ago by Kai-Holger Brassel
Hide whitespace changes
Inline Side-by-side

Showing

with 168 additions and 159 deletions
+168 -159
--- a/EclipseDemoCatalog/demo.catalog.edit/.classpath
+++ b/EclipseDemoCatalog/demo.catalog.edit/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/EclipseDemoCatalog/demo.catalog.edit/plugin.xml
+++ b/EclipseDemoCatalog/demo.catalog.edit/plugin.xml
@@ -7,10 +7,10 @@
 <plugin>
   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated democatalog -->
+      <!-- @generated DemoCatalog -->
      <factory
            uri="http://www.example.org/democatalog"
-            class="demo.catalog.democatalog.provider.democatalogItemProviderAdapterFactory"
+            class="demo.catalog.democatalog.provider.DemoCatalogItemProviderAdapterFactory"
            supportedTypes=
              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java
@@ -3,7 +3,7 @@
 package demo.catalog.democatalog.provider;
 import demo.catalog.democatalog.Boiler;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +61,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
 						getResourceLocator(), getString("_UI_Boiler_boilerType_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_Boiler_boilerType_feature",
 								"_UI_Boiler_type"),
-						democatalogPackage.Literals.BOILER__BOILER_TYPE, true, false, false,
+						DemoCatalogPackage.Literals.BOILER__BOILER_TYPE, true, false, false,
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -111,7 +111,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
 		updateChildren(notification);
 		switch (notification.getFeatureID(Boiler.class)) {
-		case democatalogPackage.BOILER__BOILER_TYPE:
+		case DemoCatalogPackage.BOILER__BOILER_TYPE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java
@@ -3,7 +3,7 @@
 package demo.catalog.democatalog.provider;
 import demo.catalog.democatalog.ChemicalEnergyDevice;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +61,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
 				getString("_UI_ChemicalEnergyDevice_installedThermalPower_feature"),
 				getString("_UI_PropertyDescriptor_description",
 						"_UI_ChemicalEnergyDevice_installedThermalPower_feature", "_UI_ChemicalEnergyDevice_type"),
-				democatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, true, false, false,
+				DemoCatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, true, false, false,
 				ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
@@ -100,7 +100,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
 		updateChildren(notification);
 		switch (notification.getFeatureID(ChemicalEnergyDevice.class)) {
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java
@@ -3,7 +3,7 @@
 package demo.catalog.democatalog.provider;
 import demo.catalog.democatalog.CombinedHeatPower;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +61,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
 						getResourceLocator(), getString("_UI_CombinedHeatPower_thermalEfficiency_feature"),
 						getString("_UI_PropertyDescriptor_description",
 								"_UI_CombinedHeatPower_thermalEfficiency_feature", "_UI_CombinedHeatPower_type"),
-						democatalogPackage.Literals.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, true, false, false,
+						DemoCatalogPackage.Literals.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, true, false, false,
 						ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
@@ -111,7 +111,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
 		updateChildren(notification);
 		switch (notification.getFeatureID(CombinedHeatPower.class)) {
-		case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java
@@ -2,8 +2,8 @@
 */
 package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.EnergyComponent;
-import demo.catalog.democatalog.democatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -72,7 +72,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
 						getResourceLocator(), getString("_UI_EnergyComponent_modelName_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_modelName_feature",
 								"_UI_EnergyComponent_type"),
-						democatalogPackage.Literals.ENERGY_COMPONENT__MODEL_NAME, true, false, false,
+						DemoCatalogPackage.Literals.ENERGY_COMPONENT__MODEL_NAME, true, false, false,
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -88,7 +88,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
 				getString("_UI_EnergyComponent_revisionYear_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_revisionYear_feature",
 						"_UI_EnergyComponent_type"),
-				democatalogPackage.Literals.ENERGY_COMPONENT__REVISION_YEAR, true, false, false,
+				DemoCatalogPackage.Literals.ENERGY_COMPONENT__REVISION_YEAR, true, false, false,
 				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
@@ -104,7 +104,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
 						getResourceLocator(), getString("_UI_EnergyComponent_producedBy_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_producedBy_feature",
 								"_UI_EnergyComponent_type"),
-						democatalogPackage.Literals.ENERGY_COMPONENT__PRODUCED_BY, true, false, true, null, null,
+						DemoCatalogPackage.Literals.ENERGY_COMPONENT__PRODUCED_BY, true, false, true, null, null,
 						null));
 	}
@@ -143,8 +143,8 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
 		updateChildren(notification);
 		switch (notification.getFeatureID(EnergyComponent.class)) {
-		case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+		case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
-		case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+		case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java
@@ -2,9 +2,9 @@
 */
 package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogFactory;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.EnergyComponentsCatalog;
-import demo.catalog.democatalog.democatalogFactory;
-import demo.catalog.democatalog.democatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -73,7 +73,7 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
 						getResourceLocator(), getString("_UI_EnergyComponentsCatalog_author_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponentsCatalog_author_feature",
 								"_UI_EnergyComponentsCatalog_type"),
-						democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__AUTHOR, true, false, false,
+						DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__AUTHOR, true, false, false,
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -89,11 +89,11 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS);
+			childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS);
-			childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS);
+			childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS);
-			childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
+			childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
-			childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS);
+			childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS);
-			childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
+			childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
 		}
 		return childrenFeatures;
 	}
@@ -157,14 +157,14 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
 		updateChildren(notification);
 		switch (notification.getFeatureID(EnergyComponentsCatalog.class)) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
 		}
@@ -182,21 +182,21 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS,
+		newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS,
-				democatalogFactory.eINSTANCE.createBoiler()));
+				DemoCatalogFactory.eINSTANCE.createBoiler()));
-		newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS,
+		newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS,
-				democatalogFactory.eINSTANCE.createCombinedHeatPower()));
+				DemoCatalogFactory.eINSTANCE.createCombinedHeatPower()));
-		newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS,
+		newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS,
-				democatalogFactory.eINSTANCE.createSolarPanel()));
+				DemoCatalogFactory.eINSTANCE.createSolarPanel()));
-		newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS,
+		newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS,
-				democatalogFactory.eINSTANCE.createInverter()));
+				DemoCatalogFactory.eINSTANCE.createInverter()));
 		newChildDescriptors
-				.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS,
+				.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS,
-						democatalogFactory.eINSTANCE.createManufacturer()));
+						DemoCatalogFactory.eINSTANCE.createManufacturer()));
 	}
 	/**

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java
@@ -2,8 +2,8 @@
 */
 package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.Inverter;
-import demo.catalog.democatalog.democatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +61,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
 						getResourceLocator(), getString("_UI_Inverter_nominalPower_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_Inverter_nominalPower_feature",
 								"_UI_Inverter_type"),
-						democatalogPackage.Literals.INVERTER__NOMINAL_POWER, true, false, false,
+						DemoCatalogPackage.Literals.INVERTER__NOMINAL_POWER, true, false, false,
 						ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
@@ -111,7 +111,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
 		updateChildren(notification);
 		switch (notification.getFeatureID(Inverter.class)) {
-		case democatalogPackage.INVERTER__NOMINAL_POWER:
+		case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java
@@ -2,8 +2,8 @@
 */
 package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.Manufacturer;
-import demo.catalog.democatalog.democatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -69,7 +70,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
 						getResourceLocator(), getString("_UI_Manufacturer_name_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_Manufacturer_name_feature",
 								"_UI_Manufacturer_type"),
-						democatalogPackage.Literals.MANUFACTURER__NAME, true, false, false,
+						DemoCatalogPackage.Literals.MANUFACTURER__NAME, true, false, false,
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -119,7 +120,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
 		updateChildren(notification);
 		switch (notification.getFeatureID(Manufacturer.class)) {
-		case democatalogPackage.MANUFACTURER__NAME:
+		case DemoCatalogPackage.MANUFACTURER__NAME:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java
@@ -2,8 +2,8 @@
 */
 package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.SolarPanel;
-import demo.catalog.democatalog.democatalogPackage;
 import java.util.Collection;
 import java.util.List;
@@ -61,7 +61,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
 						getResourceLocator(), getString("_UI_SolarPanel_nominalPower_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_SolarPanel_nominalPower_feature",
 								"_UI_SolarPanel_type"),
-						democatalogPackage.Literals.SOLAR_PANEL__NOMINAL_POWER, true, false, false,
+						DemoCatalogPackage.Literals.SOLAR_PANEL__NOMINAL_POWER, true, false, false,
 						ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
@@ -111,7 +111,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
 		updateChildren(notification);
 		switch (notification.getFeatureID(SolarPanel.class)) {
-		case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+		case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		}

--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java
@@ -2,7 +2,7 @@
 */
 package demo.catalog.democatalog.provider;
-import demo.catalog.democatalog.util.democatalogAdapterFactory;
+import demo.catalog.democatalog.util.DemoCatalogAdapterFactory;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,7 +32,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 * <!-- end-user-doc -->
 * @generated
 */
-public class democatalogItemProviderAdapterFactory extends democatalogAdapterFactory
+public class DemoCatalogItemProviderAdapterFactory extends DemoCatalogAdapterFactory
 		implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -64,7 +64,7 @@ public class democatalogItemProviderAdapterFactory extends democatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogItemProviderAdapterFactory() {
+	public DemoCatalogItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);

--- a/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view
+++ b/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view
@@ -2,7 +2,7 @@
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.categorization.model="http://org/eclipse/emf/ecp/view/categorization/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="_OiObUAuqEeuYGOU2ZFiRgg" name="EnergyComponentsCatalog">
  <rootEClass href="http://www.example.org/democatalog#//EnergyComponentsCatalog"/>
  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OiVwEAuqEeuYGOU2ZFiRgg" name="Control author">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_OiVwEQuqEeuYGOU2ZFiRgg">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ibEMMBz8EeuZNsASxyzjLQ">
      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.example.org/democatalog#//EnergyComponentsCatalog/author"/>
    </domainModelReference>
  </children>

--- a/EclipseDemoCatalog/demo.catalog/model/democatalog.aird
+++ b/EclipseDemoCatalog/demo.catalog/model/democatalog.aird
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
  <viewpoint:DAnalysis uid="_SE4_MPHfEeqpzsE1UYXTlQ" selectedViews="_SGBAkPHfEeqpzsE1UYXTlQ" version="14.3.1.202003261200">
-    <semanticResources>democatalog.genmodel</semanticResources>
+    <semanticResources>DemoCatalog.genmodel</semanticResources>
-    <semanticResources>democatalog.ecore</semanticResources>
+    <semanticResources>DemoCatalog.ecore</semanticResources>
    <ownedViews xmi:type="viewpoint:DView" uid="_SGBAkPHfEeqpzsE1UYXTlQ">
      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_SGYM8PHfEeqpzsE1UYXTlQ" name="democatalog" repPath="#_SGOb8PHfEeqpzsE1UYXTlQ" changeId="c23738b8-8873-4b1c-a69c-8cf98bdb72c3">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_SGYM8PHfEeqpzsE1UYXTlQ" name="Demo Catalog Class Diagram" repPath="#_SGOb8PHfEeqpzsE1UYXTlQ" changeId="c23738b8-8873-4b1c-a69c-8cf98bdb72c3">
        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="democatalog.ecore#/"/>
+        <target xmi:type="ecore:EPackage" href="DemoCatalog.ecore#/"/>
      </ownedRepresentationDescriptors>
    </ownedViews>
  </viewpoint:DAnalysis>
@@ -348,8 +348,8 @@
      </data>
    </ownedAnnotationEntries>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jloKUPQJEeqpzsE1UYXTlQ" name="EnergyComponentsCatalog" tooltipText="" outgoingEdges="_VvGioPgrEeqWp_4Vt6rljA _dZqak_grEeqWp_4Vt6rljA _nPGOoPgrEeqWp_4Vt6rljA _FYHQr_gsEeqWp_4Vt6rljA _J3T_5fgsEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponentsCatalog"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponentsCatalog"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponentsCatalog"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponentsCatalog"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -358,8 +358,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_BtBScPUMEeqpzsE1UYXTlQ" name="author : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponentsCatalog/author"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponentsCatalog/author"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_OiLzjPgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -367,8 +367,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JkJeIPgqEeqWp_4Vt6rljA" name="BoilerType" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EEnum" href="democatalog.ecore#//BoilerType"/>
+      <target xmi:type="ecore:EEnum" href="DemoCatalog.ecore#//BoilerType"/>
-      <semanticElements xmi:type="ecore:EEnum" href="democatalog.ecore#//BoilerType"/>
+      <semanticElements xmi:type="ecore:EEnum" href="DemoCatalog.ecore#//BoilerType"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -377,16 +377,16 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_L6PLwPgqEeqWp_4Vt6rljA" name="LowTemperature" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/LowTemperature"/>
+        <target xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/LowTemperature"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_L6Py0PgqEeqWp_4Vt6rljA" labelAlignment="LEFT">
          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
        </ownedStyle>
        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
      </ownedElements>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_Q7k-sPgqEeqWp_4Vt6rljA" name="Condensing" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/Condensing"/>
+        <target xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/Condensing"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/Condensing"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/Condensing"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_Q7llwPgqEeqWp_4Vt6rljA" labelAlignment="LEFT">
          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
        </ownedStyle>
@@ -394,8 +394,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VPPMQPgqEeqWp_4Vt6rljA" name="Boiler" tooltipText="" outgoingEdges="_eW4bUPgsEeqWp_4Vt6rljA" incomingEdges="_VvGioPgrEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -404,8 +404,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_-D7t0fgqEeqWp_4Vt6rljA" name="boilerType : BoilerType = LowTemperature" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Boiler/boilerType"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Boiler/boilerType"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Boiler/boilerType"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Boiler/boilerType"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_-D8U4fgqEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -413,8 +413,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Vo_JAPgqEeqWp_4Vt6rljA" name="CombinedHeatPower" tooltipText="" outgoingEdges="_fu9olvgsEeqWp_4Vt6rljA" incomingEdges="_dZqak_grEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -423,8 +423,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_I69hwfgrEeqWp_4Vt6rljA" name="thermalEfficiency : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_I69hwvgrEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -432,8 +432,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V5wI4PgqEeqWp_4Vt6rljA" name="SolarPanel" tooltipText="" outgoingEdges="_-YCDpvgsEeqWp_4Vt6rljA" incomingEdges="_nPGOoPgrEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -442,8 +442,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zq-V8_gqEeqWp_4Vt6rljA" name="nominalPower : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//SolarPanel/nominalPower"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//SolarPanel/nominalPower"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//SolarPanel/nominalPower"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//SolarPanel/nominalPower"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_OzKEM_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -451,8 +451,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_WG2JsPgqEeqWp_4Vt6rljA" name="Inverter" tooltipText="" outgoingEdges="_J5vMWPgtEeqWp_4Vt6rljA" incomingEdges="_FYHQr_gsEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -461,8 +461,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_vQWkwPgqEeqWp_4Vt6rljA" name="nominalPower : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Inverter/nominalPower"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Inverter/nominalPower"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Inverter/nominalPower"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Inverter/nominalPower"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_QIYKs_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -470,8 +470,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_X7xD8PgqEeqWp_4Vt6rljA" name="Manufacturer" tooltipText="" incomingEdges="_J3T_5fgsEeqWp_4Vt6rljA _Xn1T8PgtEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//Manufacturer"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Manufacturer"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Manufacturer"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Manufacturer"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -480,8 +480,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_qL_TAPgqEeqWp_4Vt6rljA" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Manufacturer/name"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Manufacturer/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Manufacturer/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Manufacturer/name"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_RPaEM_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -489,8 +489,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VvGioPgrEeqWp_4Vt6rljA" name="[0..*] boilers" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_VPPMQPgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_VvIX0PgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
        <customFeatures>routingStyle</customFeatures>
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_VvI-4fgrEeqWp_4Vt6rljA" showIcon="false">
@@ -503,8 +503,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dZqak_grEeqWp_4Vt6rljA" name="[0..*] chps" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_Vo_JAPgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/chps"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/chps"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dZrBoPgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dZrBovgrEeqWp_4Vt6rljA" showIcon="false">
          <customFeatures>labelSize</customFeatures>
@@ -516,8 +516,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_nPGOoPgrEeqWp_4Vt6rljA" name="[0..*] solarpanels" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_V5wI4PgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nPGOofgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nPGOo_grEeqWp_4Vt6rljA" showIcon="false">
          <customFeatures>labelSize</customFeatures>
@@ -529,8 +529,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FYHQr_gsEeqWp_4Vt6rljA" name="[0..*] inverters" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_WG2JsPgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FYH3sPgsEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FYH3svgsEeqWp_4Vt6rljA" showIcon="false">
          <customFeatures>labelSize</customFeatures>
@@ -542,8 +542,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J3T_5fgsEeqWp_4Vt6rljA" name="[0..*] manufacturers" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_X7xD8PgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J3Um4PgsEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J3Um4vgsEeqWp_4Vt6rljA" showIcon="false">
          <customFeatures>labelSize</customFeatures>
@@ -555,8 +555,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Ukla0PgsEeqWp_4Vt6rljA" name="ChemicalEnergyDevice" tooltipText="" outgoingEdges="_DLbhQvgtEeqWp_4Vt6rljA" incomingEdges="_eW4bUPgsEeqWp_4Vt6rljA _fu9olvgsEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -566,8 +566,8 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_YWmT4PgsEeqWp_4Vt6rljA" name="installedThermalPower : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_hELvFPgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
@@ -575,8 +575,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_eW4bUPgsEeqWp_4Vt6rljA" sourceNode="_VPPMQPgqEeqWp_4Vt6rljA" targetNode="_Ukla0PgsEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_eW5CYPgsEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_eW5CYfgsEeqWp_4Vt6rljA" showIcon="false">
@@ -587,8 +587,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_fu9olvgsEeqWp_4Vt6rljA" sourceNode="_Vo_JAPgqEeqWp_4Vt6rljA" targetNode="_Ukla0PgsEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_fu-PoPgsEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_fu-PofgsEeqWp_4Vt6rljA" showIcon="false">
@@ -599,8 +599,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ktLPAPgsEeqWp_4Vt6rljA" name="EnergyComponent" tooltipText="" outgoingEdges="_Xn1T8PgtEeqWp_4Vt6rljA" incomingEdges="_-YCDpvgsEeqWp_4Vt6rljA _DLbhQvgtEeqWp_4Vt6rljA _J5vMWPgtEeqWp_4Vt6rljA" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponent"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponent"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponent"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponent"/>
      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -610,16 +610,16 @@
      </ownedStyle>
      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_nhOD8PgsEeqWp_4Vt6rljA" name="modelName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/modelName"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/modelName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/modelName"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/modelName"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_pYd5cvgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
          <labelFormat>bold</labelFormat>
        </ownedStyle>
        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
      </ownedElements>
      <ownedElements xmi:type="diagram:DNodeListElement" uid="_q90GoPgsEeqWp_4Vt6rljA" name="revisionYear : EInt" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/revisionYear"/>
+        <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/revisionYear"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
        <ownedStyle xmi:type="diagram:BundledImage" uid="_IIbr8grfEeunxsCBJoWsPQ" labelAlignment="LEFT">
          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
        </ownedStyle>
@@ -627,8 +627,8 @@
      </ownedElements>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_-YCDpvgsEeqWp_4Vt6rljA" sourceNode="_V5wI4PgqEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_BmdugPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_BmdugfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -639,8 +639,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_DLbhQvgtEeqWp_4Vt6rljA" sourceNode="_Ukla0PgsEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_DLcIQPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_DLcIQfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -651,8 +651,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J5vMWPgtEeqWp_4Vt6rljA" sourceNode="_WG2JsPgqEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+      <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
-      <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+      <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J5vzUPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J5vzUfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -663,8 +663,8 @@
      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
    </ownedDiagramElements>
    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Xn1T8PgtEeqWp_4Vt6rljA" name="[1..1] producedBy" sourceNode="_ktLPAPgsEeqWp_4Vt6rljA" targetNode="_X7xD8PgqEeqWp_4Vt6rljA">
-      <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponent/producedBy"/>
+      <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponent/producedBy"/>
-      <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponent/producedBy"/>
+      <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponent/producedBy"/>
      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ajdXn_gtEeqWp_4Vt6rljA" description="_ajdXnPgtEeqWp_4Vt6rljA" routingStyle="manhattan" strokeColor="0,0,0">
        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ajdXofgtEeqWp_4Vt6rljA" showIcon="false">
          <labelFormat>bold</labelFormat>
@@ -678,6 +678,6 @@
    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-    <target xmi:type="ecore:EPackage" href="democatalog.ecore#/"/>
+    <target xmi:type="ecore:EPackage" href="DemoCatalog.ecore#/"/>
  </diagram:DSemanticDiagram>
 </xmi:XMI>
--- a/EclipseDemoCatalog/demo.catalog/model/democatalog.ecore
+++ b/EclipseDemoCatalog/demo.catalog/model/democatalog.ecore
--- a/EclipseDemoCatalog/demo.catalog/model/democatalog.genmodel
+++ b/EclipseDemoCatalog/demo.catalog/model/democatalog.genmodel
@@ -6,44 +6,44 @@
    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
    operationReflection="true" importOrganizing="true">
-  <foreignModel>democatalog.ecore</foreignModel>
+  <foreignModel>DemoCatalog.ecore</foreignModel>
  <testsDirectory xsi:nil="true"/>
-  <genPackages prefix="democatalog" basePackage="demo.catalog" disposableProviderFactory="true"
+  <genPackages prefix="DemoCatalog" basePackage="demo.catalog" disposableProviderFactory="true"
-      ecorePackage="democatalog.ecore#/">
+      ecorePackage="DemoCatalog.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="democatalog.ecore#//BoilerType">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="DemoCatalog.ecore#//BoilerType">
-      <genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/LowTemperature"/>
+      <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
-      <genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/Condensing"/>
+      <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/Condensing"/>
    </genEnums>
-    <genClasses ecoreClass="democatalog.ecore#//EnergyComponentsCatalog">
+    <genClasses ecoreClass="DemoCatalog.ecore#//EnergyComponentsCatalog">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponentsCatalog/author"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/chps"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
    </genClasses>
-    <genClasses ecoreClass="democatalog.ecore#//Boiler">
+    <genClasses ecoreClass="DemoCatalog.ecore#//Boiler">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Boiler/boilerType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Boiler/boilerType"/>
    </genClasses>
-    <genClasses ecoreClass="democatalog.ecore#//CombinedHeatPower">
+    <genClasses ecoreClass="DemoCatalog.ecore#//CombinedHeatPower">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
    </genClasses>
-    <genClasses ecoreClass="democatalog.ecore#//SolarPanel">
+    <genClasses ecoreClass="DemoCatalog.ecore#//SolarPanel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//SolarPanel/nominalPower"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//SolarPanel/nominalPower"/>
    </genClasses>
-    <genClasses ecoreClass="democatalog.ecore#//Inverter">
+    <genClasses ecoreClass="DemoCatalog.ecore#//Inverter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Inverter/nominalPower"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Inverter/nominalPower"/>
    </genClasses>
-    <genClasses ecoreClass="democatalog.ecore#//Manufacturer">
+    <genClasses ecoreClass="DemoCatalog.ecore#//Manufacturer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Manufacturer/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Manufacturer/name"/>
    </genClasses>
-    <genClasses image="false" ecoreClass="democatalog.ecore#//ChemicalEnergyDevice">
+    <genClasses image="false" ecoreClass="DemoCatalog.ecore#//ChemicalEnergyDevice">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
    </genClasses>
-    <genClasses image="false" ecoreClass="democatalog.ecore#//EnergyComponent">
+    <genClasses image="false" ecoreClass="DemoCatalog.ecore#//EnergyComponent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponent/modelName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponent/modelName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponent/revisionYear"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponent/producedBy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponent/producedBy"/>
    </genClasses>
  </genPackages>
 </genmodel:GenModel>
--- a/EclipseDemoCatalog/demo.catalog/plugin.xml
+++ b/EclipseDemoCatalog/demo.catalog/plugin.xml
@@ -11,7 +11,15 @@
      <package
            uri="http://www.example.org/democatalog"
            class="demo.catalog.democatalog.democatalogPackage"
-            genModel="model/democatalog.genmodel"/>
+            genModel="model/DemoCatalog.genmodel"/>
+   </extension>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated DemoCatalog -->
+      <package
+            uri="http://www.example.org/democatalog"
+            class="demo.catalog.democatalog.DemoCatalogPackage"
+            genModel="model/DemoCatalog.genmodel"/>
   </extension>
 </plugin>
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
 *   <li>{@link demo.catalog.democatalog.Boiler#getBoilerType <em>Boiler Type</em>}</li>
 * </ul>
 *
- * @see demo.catalog.democatalog.democatalogPackage#getBoiler()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler()
 * @model
 * @generated
 */
@@ -27,7 +27,7 @@ public interface Boiler extends ChemicalEnergyDevice {
 	 * @return the value of the '<em>Boiler Type</em>' attribute.
 	 * @see demo.catalog.democatalog.BoilerType
 	 * @see #setBoilerType(BoilerType)
-	 * @see demo.catalog.democatalog.democatalogPackage#getBoiler_BoilerType()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler_BoilerType()
 	 * @model required="true"
 	 * @generated
 	 */

--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
 * A representation of the literals of the enumeration '<em><b>Boiler Type</b></em>',
 * and utility methods for working with them.
 * <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogPackage#getBoilerType()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getBoilerType()
 * @model
 * @generated
 */

--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
 *   <li>{@link demo.catalog.democatalog.ChemicalEnergyDevice#getInstalledThermalPower <em>Installed Thermal Power</em>}</li>
 * </ul>
 *
- * @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice()
 * @model abstract="true"
 * @generated
 */
@@ -25,7 +25,7 @@ public interface ChemicalEnergyDevice extends EnergyComponent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Installed Thermal Power</em>' attribute.
 	 * @see #setInstalledThermalPower(double)
-	 * @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice_InstalledThermalPower()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice_InstalledThermalPower()
 	 * @model required="true"
 	 * @generated
 	 */

--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
 *   <li>{@link demo.catalog.democatalog.CombinedHeatPower#getThermalEfficiency <em>Thermal Efficiency</em>}</li>
 * </ul>
 *
- * @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower()
 * @model
 * @generated
 */
@@ -25,7 +25,7 @@ public interface CombinedHeatPower extends ChemicalEnergyDevice {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Thermal Efficiency</em>' attribute.
 	 * @see #setThermalEfficiency(double)
-	 * @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower_ThermalEfficiency()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower_ThermalEfficiency()
 	 * @model required="true"
 	 * @generated
 	 */