Naming convention: prefix source packages in FCM and CPP profile with org.eclipse.papyrus.

112 files changed, 1574 insertions, 1170 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver$1.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver$1.class
deleted file mode 100644
index 3e2820bfbbd..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver$1.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver.class
deleted file mode 100644
index 742415f4921..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoDriver.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoException.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoException.class
deleted file mode 100644
index 3fc350e86b7..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/AcceleoException.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Activator.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Activator.class
deleted file mode 100644
index 17355520d07..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Activator.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/ModelElementsCreator.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/ModelElementsCreator.class
deleted file mode 100644
index 36a1d1a186f..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/ModelElementsCreator.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Utils.class b/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Utils.class
deleted file mode 100644
index bb12a965bda..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/Utils.class
+++ /dev/null
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java
index 3ac74c8ff6f..700cf3c670e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/AcceleoDriver.java
@@ -185,7 +185,7 @@ public class AcceleoDriver {
 	 * @return the evaluated template
 	 */
 	public static String evaluate(String templateStr, Element element, Object args[]) throws AcceleoException {
-		return evaluate(templateStr, "", element, args);
+		return evaluate(templateStr, "dummy", element, args);
 	}
 
 	/**
@@ -273,16 +273,19 @@ public class AcceleoDriver {
 						"\n\nTemplate: " + templateName + "\n" + templateStr);
 				}
 			}
-			String result = evaulateResource(resource, element, templateName, templateStr);
+			String result = evaluateResource(resource, element, templateName, templateStr);
 			if(result != null) {
 				return result;
 			}
+		
 		} catch (AcceleoEvaluationException e) {
 			String elementStr = (element instanceof NamedElement ? ((NamedElement)element).getQualifiedName() : element.toString());
 			throw new AcceleoException("Acceleo EvaluationException" + e + "\n\nPassed element: " + elementStr +
 				"\n\nTemplate: " + templateName + "\n" + templateStr);
 		}
-		return "";
+		String elementStr = (element instanceof NamedElement ? ((NamedElement)element).getQualifiedName() : element.toString());
+		throw new AcceleoException("Acceleo evaluation error\n\nPassed element: " + elementStr +
+				"\n\nTemplate: " + templateName + "\n" + templateStr);
 	}
 
 	/**
@@ -322,12 +325,23 @@ public class AcceleoDriver {
 
 		Resource resource = acceleoResourceSet.getResource(uri, true);
 		if(resource != null) {
-			return evaulateResource(resource, element, templateName, "");
+			return evaluateResource(resource, element, templateName, "");
 		}
 		return null;
 	}
 
-	protected static String evaulateResource(Resource resource, Element element, String templateName, String templateStr) throws AcceleoException {
+	/**
+	 * Evaluate an Acceleo template when given a resource, template name
+	 * 
+	 * @param resource The resource of an Acceleo module
+	 * @param element the UML model element that is passed (
+	 * @param templateName the name of the template
+	 * @param templateStr the contents of the template. May be empty (only used for
+	 *        error messages
+	 * @return the evaluated template
+	 * @throws AcceleoException
+	 */
+	protected static String evaluateResource(Resource resource, Element element, String templateName, String templateStr) throws AcceleoException {
 		if(resource.getContents().size() > 0) {
 			EObject result = resource.getContents().get(0);
 			List<Object> arguments = new ArrayList<Object>();
@@ -335,8 +349,10 @@ public class AcceleoDriver {
 			arguments.add(element);
 			if(result instanceof Module) {
 				Module module = (Module)result;
+				// do not check the template name, if there is only one. 
+				boolean dontCheck = (module.getOwnedModuleElement().size() == 1);
 				for(ModuleElement me : module.getOwnedModuleElement()) {
-					if((me instanceof Template) && me.getName().equals(templateName)) {
+					if((me instanceof Template) && (dontCheck || me.getName().equals(templateName))) {
 						logEntries.clear();
 						Object stringResult = engine.evaluate((Template)me, arguments, new PreviewStrategy(), null);
 						// System.err.println("result: " + stringResult);
@@ -362,7 +378,7 @@ public class AcceleoDriver {
 				}
 			}
 		}
-		return null;
+		throw new AcceleoEvaluationException("Template " + templateName + " not found");
 	}
 
 	protected static EList<IStatus> logEntries = new BasicEList<IStatus>();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
new file mode 100644
index 00000000000..a8db150a582
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
@@ -0,0 +1,448 @@
+/*******************************************************************************
+ * Copyright (c) 2006 - 2012 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA LIST - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.papyrus.acceleo;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.UniqueEList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Dependency;
+import org.eclipse.uml2.uml.DirectedRelationship;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterableElement;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.TemplateBinding;
+import org.eclipse.uml2.uml.TemplateParameter;
+import org.eclipse.uml2.uml.TemplateSignature;
+import org.eclipse.uml2.uml.Type;
+
+
+/**
+ * Some utilities: a set of static methods for Acceleo based code generation
+ * 
+ * @author wassim
+ * 
+ */
+public class GenUtils {
+
+	/**
+	 * Retrieve template bindings for the class passed as a Parameter
+	 * only one template binding can exist for an element
+	 * 
+	 * @param current
+	 *        Class on which the template binding is searched
+	 * @return the template binding of current Class
+	 */
+	public static TemplateBinding getTemplateBindings(Class current) {
+		TemplateBinding binding = null;
+		if(current.getTemplateBindings().size() == 1) {
+			binding = current.getTemplateBindings().get(0);
+		}
+
+		return binding;
+	}
+
+	/**
+	 * Check whether the passed classifier has a template binding with itself as bound element
+	 *
+	 * @param cl
+	 * @return
+	 */
+	public static boolean isTemplateBoundElement(Classifier cl) {
+		boolean result = false;
+		EList<TemplateBinding> tbs = cl.getTemplateBindings();
+		if(tbs.size() > 0) {
+			for (TemplateBinding tb : tbs) {
+				// TODO: will only work for single element in template binding list
+				result = tb.getBoundElement() == cl;
+			}
+		}
+		return result;
+	}
+
+	
+	/**
+	 * 
+	 * @param classifier
+	 * @return
+	 */
+	public static Collection<TemplateParameter> getTemplateParameters(Classifier classifier) {
+
+		Collection<TemplateParameter> params = new ArrayList<TemplateParameter>();
+		TemplateSignature ts = classifier.getOwnedTemplateSignature();
+		if(ts != null) {
+			params.addAll(ts.getOwnedParameters());
+		}
+
+		return params;
+	}
+
+	/**
+	 * 
+	 * @param classifier
+	 * @return
+	 */
+	public static Collection<ParameterableElement> getTemplateParameteredElements(Classifier classifier) {
+
+		Collection<ParameterableElement> params = new ArrayList<ParameterableElement>();
+		TemplateSignature ts = classifier.getOwnedTemplateSignature();
+		if(ts != null) {
+			for(TemplateParameter tp : ts.getOwnedParameters()) {
+				if(tp != null) {
+					params.add(tp.getParameteredElement());
+				}
+			}
+		}
+		return params;
+	}
+
+
+	/**
+	 * Retrieve a list of types that belong to by a classifier in the current class
+	 * 
+	 * @param current
+	 *        Class on which the attributes are searched
+	 * @return collection of classes which are the type of the attributes
+	 */
+	public static EList<Classifier> getTypesViaAttributesk(Classifier current) {
+		EList<Classifier> result = new UniqueEList<Classifier>();
+
+		for (Property currentAttribute : current.getAttributes()) {
+			Type type = currentAttribute.getType();
+			if(type instanceof Classifier) {
+				result.add((Classifier) type);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Retrieve the operations in the current class then for each
+	 * operation it finds the parameters that have a class type
+	 * 
+	 * @param current
+	 *        Class on which the attributes are searched
+	 * @return collection of classes which are the types of the operations parameters
+	 */
+	public static EList<Classifier> getTypesViaOperations(Classifier current) {
+		EList<Classifier> result = new UniqueEList<Classifier>();
+		for(Operation operation : current.getOperations()) {
+			for (Parameter param : operation.getOwnedParameters()) {
+				Type type = param.getType();
+				if(type instanceof Classifier) {
+					Classifier paramType = (Classifier)type;
+					result.add(paramType);
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Return a list of classifiers that are referenced by relationships, i.e.
+	 * dependencies or associations
+	 * 
+	 * @param current
+	 * @return
+	 */
+	public static EList<Classifier> getTypesViaRelationships(Classifier current) {
+		EList<Classifier> classifiers = new UniqueEList<Classifier>();
+
+		for(DirectedRelationship relationship : current.getSourceDirectedRelationships()) {
+
+			if(relationship.getTargets().size() > 0) {
+				// there should always be at least one element in the target
+				// list and it should be a classifier, but better check.
+				Element element = relationship.getTargets().get(0);
+				if(element instanceof Classifier) {
+					classifiers.add((Classifier)element);
+				}
+			}
+		}
+		return classifiers;
+	}
+
+	/**
+	 * Return a list of classifiers that are referenced via dependencies
+	 * 
+	 * @param current
+	 * @return
+	 */
+	public static EList<Classifier> getTypesViaDependencies(Classifier current) {
+		EList<Classifier> classifiers = new UniqueEList<Classifier>();
+
+		for(DirectedRelationship relationship : current.getSourceDirectedRelationships()) {
+			if(relationship instanceof Dependency) {
+				if(relationship.getTargets().size() > 0) {
+					// there should always be at least one element in the target
+					// list and it should be a classifier, but better check.
+					Element element = relationship.getTargets().get(0);
+					if(element instanceof Classifier) {
+						classifiers.add((Classifier)element);
+					}
+				}
+			}
+		}
+		return classifiers;
+	}
+
+	/**
+	 * Return a list of classifiers that are referenced via all kinds of relations except
+	 * dependencies
+	 * 
+	 * @param current
+	 * @return
+	 */
+	public static EList<Classifier> getTypesViaRelationshipsNoDeps(Classifier current) {
+		EList<Classifier> classifiers = new UniqueEList<Classifier>();
+
+		for(DirectedRelationship relationship : current.getSourceDirectedRelationships()) {
+			if(!(relationship instanceof Dependency)) {
+				if(relationship.getTargets().size() > 0) {
+					// there should always be at least one element in the target
+					// list and it should be a classifier, but better check.
+					Element element = relationship.getTargets().get(0);
+					if(element instanceof Classifier) {
+						classifiers.add((Classifier)element);
+					}
+				}
+			}
+		}
+		return classifiers;
+	}
+
+	/**
+	 * Return the qualified name of a named element, but use "_" instead of "::" as separator
+	 * 
+	 * @param ne
+	 *        a named element
+	 * @return the fully qualified name with "_" as separator character
+	 */
+	public static String getFullName(NamedElement ne) {
+		return ne.getQualifiedName().replace("::", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * return the full name in upper case
+	 * 
+	 * @param ne
+	 * @return
+	 */
+	public static String getFullNameUC(NamedElement ne) {
+		return ne.getQualifiedName().replace("::", "_").toUpperCase(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	
+	/**
+	 * Retrieve the comments associated with an element
+	 * TODO: check whether comment's annotated element link belongs to element in question
+	 * @param element
+	 * @return
+	 */
+	public static String getComments(Element element) {
+		String commentText = ""; //$NON-NLS-1$
+		for(Comment comment : element.getOwnedComments()) {
+			// remove eventual CRs (avoid confusion in Acceleo template which adds " *" after line breaks)
+			commentText += cleanCR(comment.getBody());
+		}
+		return commentText;
+	}
+
+	/**
+	 * Return a list of dependent package (the list of dependent
+	 * elements filtered for packages)
+	 * 
+	 * @param pkg
+	 * @return
+	 */
+	public static EList<Package> getUsedPackages(Package pkg) {
+		EList<Package> result = new UniqueEList<Package>();
+		for(Element depElement : pkg.getClientDependencies()) {
+			if(depElement instanceof Package) {
+				result.add((Package)depElement);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Return a list of dependent classifiers (the list of dependent
+	 * elements filtered for classifiers)
+	 * 
+	 * @param pkg
+	 * @return
+	 */
+	public static EList<Classifier> getUsedClassifiers(Classifier cls) {
+		EList<Classifier> result = new BasicEList<Classifier>();
+		for(Element depElement : cls.getClientDependencies()) {
+			if(depElement instanceof Classifier) {
+				result.add((Classifier)depElement);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Return the qualified name of a package, but use "/" instead of "::" as separator
+	 * 
+	 * @param pkg
+	 * @return
+	 */
+	public static String getFullPath(Package pkg) {
+		return pkg.getQualifiedName().replace("::", "/");  //$NON-NLS-1$//$NON-NLS-2$
+	}
+
+	/**
+	 * Is a certain stereotype applied?
+	 * 
+	 * @param element
+	 * @param stereotype
+	 *        fully qualified stereotype name
+	 * @return
+	 */
+	public static boolean hasStereotype(Element element, String stereotName) {
+		return element.getAppliedStereotype(stereotName) != null;
+	}
+
+	/**
+	 * Is a certain stereotype applied?
+	 * 
+	 * @param element
+	 * @param stereotype
+	 *        fully qualified stereotype name
+	 * @return
+	 */
+	public static boolean hasStereotype(Element element, java.lang.Class<? extends EObject> clazz) {
+		for(EObject stereoApplication : element.getStereotypeApplications()) {
+			// check whether the stereotype is a super-class of the passed parameter clazz
+			if(clazz.isAssignableFrom(stereoApplication.getClass())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Is a certain stereotype applied?
+	 * 
+	 * @param element
+	 * @param eClass The eClass associated with the stereotype name
+	 * @return
+	 */
+	public static boolean hasStereotypeA(Element element, EClass eClass) {
+		if(element == null) {
+			// make query more robust
+			return false;
+		}
+		for(EObject stereoApplication : element.getStereotypeApplications()) {
+			// check whether the stereotype application has the right eClass
+			if(stereoApplication.eClass() == eClass) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Return the stereotype application by passing an element of the static profile
+	 * 
+	 * @param element
+	 *        the UML model element
+	 * @param clazz
+	 *        the class of an element of a static profile. Compatible sub-types will be returned as well
+	 * @return the stereotype application or null
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends EObject> T getApplication(Element element, java.lang.Class<T> clazz) {
+		for(EObject stereoApplication : element.getStereotypeApplications()) {
+			// check whether the stereotype is an instance of the passed parameter clazz
+			if(clazz.isInstance(stereoApplication)) {
+				return (T)stereoApplication;
+			}
+		}
+		return null;
+	}
+
+	public static EObject getApplicationA(Element element, EClass eClass) {
+		for(EObject stereoApplication : element.getStereotypeApplications()) {
+			// check whether the stereotype is an instance of the passed parameter clazz
+			if(stereoApplication.eClass() == eClass) {
+				return stereoApplication;
+			}
+		}
+		return null;
+	}
+
+	
+	/**
+	 * @param operation
+	 *        the operation
+	 * @param selectedLanguage
+	 *        the selected language
+	 * @return Return the first body of a selected language that is provided by
+	 *         one of the operation's methods
+	 */
+	public static String getBody(Operation operation, String selectedLanguage) {
+		for(Behavior behavior : operation.getMethods()) {
+			if(behavior instanceof OpaqueBehavior) {
+				OpaqueBehavior ob = (OpaqueBehavior)behavior;
+				Iterator<String> bodies = ob.getBodies().iterator();
+				for(String language : ob.getLanguages()) {
+					String body = bodies.next();
+					if(language.equals(selectedLanguage)) {
+						// additional "\r" confuses Acceleo
+						return cleanCR(body);
+					}
+				}
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+	
+	/**
+	 * Remove <CR> from a String. These confuse Acceleo's indentation
+	 * @param str
+	 * @return
+	 */
+	public static String cleanCR(String str) {
+		return str.replace("\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	
+	/**
+	 * Avoid null strings, i.e. replace null strings by empty strings
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static String maskNull(String str) {
+		if(str == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return str;
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handler/GenerateCodeHandler.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handler/GenerateCodeHandler.java
index 6f58504a58a..9232fe2c0f7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handler/GenerateCodeHandler.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handler/GenerateCodeHandler.java
@@ -76,6 +76,7 @@ public class GenerateCodeHandler extends AbstractHandler {
 		if(selectedEObj instanceof Classifier) {
 			Classifier classifier = (Classifier)selectedEObj;
 
+			
 			URI uri = classifier.eResource().getURI();
 
 			// URIConverter uriConverter = resource.getResourceSet().getURIConverter();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf
new file mode 100644
index 00000000000..64fee47b4f1
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo
index 8c148cc5dcd..d3da6605d49 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.acceleo
@@ -18,7 +18,7 @@
         <acceleoCompiler 
             sourceFolder="${target.folder}"
             outputFolder="${target.folder}"
-            dependencies="${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;"
+            dependencies="${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.ui.workbench;${target.folder}/../../org.eclipse.papyrus.acceleo;"
             binaryResource="false"
             packagesToRegister="">
         </acceleoCompiler>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl
index 2aea121b9e5..32c94e672bb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/Constants.mtl
@@ -2,35 +2,35 @@
 [module Constants('http://www.eclipse.org/uml2/4.0.0/UML')]
 
 
-[template public includeHFile(dummy : Element)]
+[template public constIncludeHFile(dummy : Element)]
 // include associated header file
 [/template]
 
-[template public IncludeHeaderStart(dummy : Element)]
+[template public constIncludeHeaderStart(dummy : Element)]
 // Include from Include stereotype (header)
 [/template]
 
-[template public IncludePreBodyStart(dummy : Element)]
+[template public constIncludePreBodyStart(dummy : Element)]
 // Include from Include stereotype (pre-body)
 [/template]
 
-[template public IncludePreBodyEnd(dummy : Element)]
+[template public constIncludePreBodyEnd(dummy : Element)]
 // End of Include stereotype (pre-body)
 [/template]
 
-[template public IncludeBodyStart(dummy : Element)]
+[template public constIncludeBodyStart(dummy : Element)]
 // Include from Include declaration (body)
 [/template]
 
-[template public IncludeHeaderEnd(dummy : Element)]
+[template public constIncludeHeaderEnd(dummy : Element)]
 // End of Include stereotype (header)
 [/template]
 
-[template public IncludeBodyEnd(dummy : Element)]
+[template public constIncludeBodyEnd(dummy : Element)]
 // End of Include stereotype (body)
 [/template]
 
-[template public derivedIncludes(dummy : Element)]
+[template public constDerivedIncludes(dummy : Element)]
 // Derived includes directives
 [/template]
 
@@ -38,7 +38,7 @@
 // forward declarations
 [/template]
 
-[template public staticAttributes(dummy : Element)]
+[template public constStaticAttributes(dummy : Element)]
 // static attributes (if any)
 [/template]
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl
index da720a05838..a5c2d6f9a17 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindBody.mtl
@@ -1,7 +1,7 @@
 [module CppBindBody('http://www.eclipse.org/uml2/4.0.0/UML')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::IncludeUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
@@ -15,23 +15,24 @@
               [class.name/] template binding body
  ************************************************************/
 
-[IncludePreBody()/]
+[CppIncludePreBody()/]
 
-[includeHFile()/]
-#include <[_package.getFullPath()/][class.name/].[getHeaderSuffix()/]>
+[constIncludeHFile()/]
+#include <[_package.getFullPath()/]/[class.name/].[getHeaderSuffix()/]>
 
-[IncludeBody()/]
+[CppIncludeBody()/]
 
 [openNS()/]
 
-[derivedIncludes()/]
+[constDerivedIncludes()/]
 [CppClassAllIncludesDeclaration()/]
 
 /************************************************************/
 [let tb : TemplateBinding = getTemplateBindings()]
-[let templateElement : Classifier = tb.target->asSequence()->first()]
-template class [templateElement.name/] <[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]> [class.name/];
+[let templateElement : Element = tb.target->asSequence()->first()]
+template class [templateElement.owner.oclAsType(NamedElement).name/]<[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]>;
 [/let][/let]
+
 [closeNS()/]
 
 /************************************************************
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl
index 99148264afc..3277519319a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppBindHeader.mtl
@@ -3,6 +3,7 @@
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
 
 
 [template public CppBindHeader(class : Class)] 
@@ -17,15 +18,15 @@
 
 [CppClassAllIncludesDeclaration()/]
 
-[getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).header/]
+[CppIncludeHeader()/]
 
 [let tb : TemplateBinding = getTemplateBindings()]
-[let templateElement : Classifier = tb.target->asSequence()->first()]
+[let templateElement : Element = tb.target->asSequence()->first()]
 #include <[_package.getFullPath()/]/[templateElement.owner.oclAsType(NamedElement).name/].[getHeaderSuffix()/]>
 
 [openNS()/] 
 /************************************************************/
-typedef [templateElement.name/] <[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]> [class.name/];
+typedef [templateElement.owner.oclAsType(NamedElement).name/]<[for (tb.parameterSubstitution)][CppTemplateBindingParameter()/][/for]> [class.name/];
 
 [closeNS()/]
 [/let][/let]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl
index cf2e1f70034..cf80c016c20 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassBody.mtl
@@ -2,36 +2,38 @@
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::IncludeUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::property::CppAttributeImplementation/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/]
 
 
 [template public CppClassBody(class : Classifier)]
-#define [getFullName()/]_BODY

-

-/************************************************************

-              [class.name/] class body

- ************************************************************/

-

-[IncludePreBody()/]

-

-[includeHFile()/]

-#include <[_package.getFullPath()/]/[class.name/].[getHeaderSuffix()/]>

-

-[IncludeBody()/]

-

-[derivedIncludes()/]

-[CppClassAllIncludesDeclaration()/]

-

-[openNS(class)/]

-[CppStaticAttributes(class)/]

-[CppClassOperationsImplementation(false)/]

-[closeNS(class)/]

-

-/************************************************************

-              End of [class.name/] class body

- ************************************************************/

+#define [getFullName()/]_BODY
+
+/************************************************************
+              [class.name/] class body
+ ************************************************************/
+
+[CppIncludePreBody()/]
+
+[constIncludeHFile()/]
+#include <[_package.getFullPath()/]/[class.name/].[getHeaderSuffix()/]>
+
+[CppIncludeBody()/]
+
+[constDerivedIncludes()/]
+[CppClassAllIncludesDeclarationBody()/]
+
+[openNS(class)/]
+[CppStaticAttributes(class)/]
+[if not isTemplate()]
+[CppClassOperationsImplementation(false)/]
+[/if]
+[closeNS(class)/]
+
+/************************************************************
+              End of [class.name/] class body
+ ************************************************************/
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
index 54920cec07c..16288f40778 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
@@ -2,7 +2,7 @@
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::IncludeUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration/]
@@ -40,55 +40,55 @@ in C++ 011/]
 
 
 [template public CppClassHeader(class : Classifier)]
-#ifndef [getFullNameUC()/]_H

-#define [getFullNameUC()/]_H

-

-/************************************************************

-              [class.name/] class header

- ************************************************************/

-

-[_package.CppOwnerPackageIncludeDeclaration()/]

-

-[CppClassAllIncludesDeclaration()/]

-
-[IncludeHeader()/]

-
-[openNS()/] 

-[_package.CppClassTypeAndEnumPackage()/]

-/************************************************************/

+#ifndef [getFullNameUC()/]_H
+#define [getFullNameUC()/]_H
+
+/************************************************************
+              [class.name/] class header
+ ************************************************************/
+
+[_package.CppOwnerPackageIncludeDeclaration()/]
+
+[CppClassAllIncludesDeclaration()/]
+
+[CppIncludeHeader()/]
+
+[openNS()/] 
+
+/************************************************************/
 [CppElementDoc()/]
-[templateSignature()/][classUnionOrStruct()/] [class.name/][CppClassInheritedDeclarations()/] {

-[CppClassIncludeFriendDeclaration()/][CppClassTypeAndEnum()/]

-

-  public:

-[defaultInitializer()/][CppClassAttributesDeclaration(VisibilityKind::public)/][CppClassOperationsDeclaration(VisibilityKind::public)/]

-

-  protected:

-[CppClassAttributesDeclaration(VisibilityKind::protected)/][CppClassOperationsDeclaration(VisibilityKind::protected)/]

-

-  private:

-[CppClassAttributesDeclaration(VisibilityKind::private)/][CppClassOperationsDeclaration(VisibilityKind::private)/]

-

-};

-/************************************************************/

-/* External declarations (package visibility)               */

-[CppClassAttributesDeclaration(VisibilityKind::_package)/]

-[CppClassOperationsDeclaration(VisibilityKind::_package)/]

+[templateSignature()/][classUnionOrStruct()/] [class.name/][CppClassInheritedDeclarations()/] {
+[CppClassIncludeFriendDeclaration()/][CppClassTypeAndEnum()/]
+
+  public:
+[defaultInitializer()/][CppClassAttributesDeclaration(VisibilityKind::public)/][CppClassOperationsDeclaration(VisibilityKind::public)/]
+
+  protected:
+[CppClassAttributesDeclaration(VisibilityKind::protected)/][CppClassOperationsDeclaration(VisibilityKind::protected)/]
+
+  private:
+[CppClassAttributesDeclaration(VisibilityKind::private)/][CppClassOperationsDeclaration(VisibilityKind::private)/]
+
+};
+/************************************************************/
+/* External declarations (package visibility)               */
+[CppClassAttributesDeclaration(VisibilityKind::_package)/]
+[CppClassOperationsDeclaration(VisibilityKind::_package)/]
 /************************************************************/
 
-[if (isTemplate())]
+[if isTemplate()]
 /************************************************************/
 /* Template functions                                       */
 [CppClassOperationsImplementation(false)/]
 [/if]
-

-/* Inline functions                                         */

-[CppClassOperationsImplementation(true)/]

-[closeNS()/]

-

-/************************************************************

-              End of [class.name/] class header

- ************************************************************/

-

-#endif

+
+/* Inline functions                                         */
+[CppClassOperationsImplementation(true)/]
+[closeNS()/]
+
+/************************************************************
+              End of [class.name/] class header
+ ************************************************************/
+
+#endif
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl
new file mode 100644
index 00000000000..e2b71dc69de
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.mtl
@@ -0,0 +1,34 @@
+[comment encoding = UTF-8 /]
+[module CppIncludeUtils('http://www.eclipse.org/uml2/4.0.0/UML')]
+[import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
+
+[template public CppIncludeHeader(ne : NamedElement)]
+[if (hasStereotype(C_Cpp::Include))]
+[let header : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).header]
+[if (header <> null) and (header.size() > 0)]
+[constIncludeHeaderStart()/]
+[header.cleanCR()/]
+[constIncludeHeaderEnd()/]
+[/if][/let][/if]
+[/template]
+
+[template public CppIncludeBody(ne : NamedElement)]
+[if (hasStereotype(C_Cpp::Include))]
+[let _body : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include)._body]
+[if (_body <> null) and (_body.size() > 0)]
+[constIncludeBodyStart()/]
+[_body.cleanCR()/]
+[constIncludeBodyEnd()/]
+[/if][/let][/if]
+[/template]
+
+[template public CppIncludePreBody(ne : NamedElement)]
+[if (hasStereotype(C_Cpp::Include))]
+[let preBody : String = getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).preBody]
+[if (preBody <> null) and (preBody.size() > 0)]
+[constIncludePreBodyStart()/]
+[preBody.cleanCR()/]
+[constIncludePreBodyEnd()/]
+[/if][/let][/if]
+[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl
index 95a0f6b8e65..a52674ea982 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppPackageHeader.mtl
@@ -2,7 +2,7 @@
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::IncludeUtils/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::CppIncludeUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration/]
@@ -12,41 +12,41 @@
 
 
 [template public CppPackageHeader(pkg : Package)]
-#ifndef PKG_[getFullNameUC()/]

-#define PKG_[getFullNameUC()/]

-

-/************************************************************

-              Pkg_[name/] package header

- ************************************************************/

-

-[nestingPackage.CppOwnerPackageIncludeDeclaration()/]

-

-#ifndef _IN_

-#define _IN_

-#endif

-#ifndef _OUT_

-#define _OUT_

-#endif

-#ifndef _INOUT_

-#define _INOUT_

-#endif

-

-	

-/* Package dependency header include                        */

-[for (getUsedPackages())]

-#include <[getFullPath()/]/Pkg_[name/].[getHeaderSuffix()/]>

-[/for]

-

-[IncludeHeader()/]

-

-[openNS()/]

+#ifndef PKG_[getFullNameUC()/]
+#define PKG_[getFullNameUC()/]
+
+/************************************************************
+              Pkg_[name/] package header
+ ************************************************************/
+
+[nestingPackage.CppOwnerPackageIncludeDeclaration()/]
+
+#ifndef _IN_
+#define _IN_
+#endif
+#ifndef _OUT_
+#define _OUT_
+#endif
+#ifndef _INOUT_
+#define _INOUT_
+#endif
+
+	
+/* Package dependency header include                        */
+[for (getUsedPackages())]
+#include <[getFullPath()/]/Pkg_[name/].[getHeaderSuffix()/]>
+[/for]
+
+[CppIncludeHeader()/]
+
+[openNS()/]
 [packageTypes()/]
-[CppClassTypeAndEnumPackage()/]

-[closeNS()/]

-

-/************************************************************

-              End of Pkg_[name/] package header

- ************************************************************/

-

-#endif

+[CppClassTypeAndEnumPackage()/]
+[closeNS()/]
+
+/************************************************************
+              End of Pkg_[name/] package header
+ ************************************************************/
+
+#endif
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/IncludeUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/IncludeUtils.mtl
deleted file mode 100644
index cd81da94794..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/IncludeUtils.mtl
+++ /dev/null
@@ -1,28 +0,0 @@
-[comment encoding = UTF-8 /]
-[module IncludeUtils('http://www.eclipse.org/uml2/4.0.0/UML')]
-[import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
-
-[template public IncludeHeader(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include) and (getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).header.size() > 0))]
-[IncludeHeaderStart()/]
-[getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).header/]
-[IncludeHeaderEnd()/]
-[/if]
-[/template]
-
-[template public IncludeBody(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include) and (getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include)._body <> null))]
-[IncludeBodyStart()/]
-[getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include)._body/]
-[IncludeBodyEnd()/]
-[/if]
-[/template]
-
-[template public IncludePreBody(ne : NamedElement)]
-[if (hasStereotype(C_Cpp::Include))]
-[IncludePreBodyStart()/]
-[getApplication(C_Cpp::Include).oclAsType(C_Cpp::Include).preBody/]
-[IncludePreBodyEnd()/]
-[/if]
-[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/property/CppAttributeImplementation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
index 57aae8be4d8..5c7d14b36ab 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/property/CppAttributeImplementation.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
@@ -1,35 +1,47 @@
-[module CppAttributeImplementation('http://www.eclipse.org/uml2/4.0.0/UML')/]
+[module CppAttribute('http://www.eclipse.org/uml2/4.0.0/UML')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::Constants/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
 
 
-[comment
-// for static implementation:
-// If attribute is aggregation then generate a pointer
-	if (GenUtils.isAggregation(currentAttribute)) {
-		// attributeName	= "(*"+attributeName+")"; // this produce a pointer on a tab
-		isAgg	= "*";      // this produce a tab of pointers
-	}
-/]
+[template public defaultValue(attribute : Property)]
+[if (defaultValue <> null) and isStatic] = [attribute.defaultValue.stringValue()/][/if]
+[/template]
+
+
+[template public staticValue(attribute : Property)]
+[if (attribute.isStatic)]static [/if]
+[/template]
+
+
+[template public CppAttributeDeclaration(attribute : Property)]
+[CppElementDoc()/]
+[staticValue()/][modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
+[/template]
+
 
 [template public CppAttributeImplementation(attribute : Property)]
 	[CppElementDoc()/]
-	[modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];

+	[modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
 [/template]
 
 [template public CppStaticAttributeImplementation(attribute : Property)]
-	[CppElementDoc()/]
-	[type.qualifiedName()/][modPtr()/][modRef()/][attribute.class.name/]::[attribute.name/][modArray()/];
+[CppElementDoc()/]
+[type.qualifiedName()/][modPtr()/][modRef()/] [attribute.class.name/]::[attribute.name/][modArray()/][defaultValue()/];
 [/template]
 
+
 [comment
 Loop over attributes. Check that the attribute is not a static const.
 Constant static attributes are declared within the class declaration/] 
 [template public CppStaticAttributes(classifier : Classifier)]
+[constStaticAttributes()/]
 [for (classifier.attribute)]
 	[if(isStatic and (not hasStereotype(C_Cpp::Const)))]
-		[CppStaticAttributeImplementation()/]
+[CppStaticAttributeImplementation()/]
+
 	[/if]
 [/for]
 [/template]
+
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl
index 644096558af..f5bb7f53e53 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.mtl
@@ -3,8 +3,8 @@
 
 
 [template public CppElementDoc(argument : Element)]
-/**

- * [getComments().replaceAll('\n', '\n * ')/]

+/**
+ * [getComments().replaceAll('\n', '\n * ')/]
  */
 [/template]
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl
index 97f7653d5c2..75f027b6d16 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.mtl
@@ -1,14 +1,14 @@
-[module CppEnumerations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppEnumerations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
 
 [template public CppEnumerationDefinition(enum : Enumeration)]
 [CppElementDoc()/]
 enum [enum.name/] {
-[for (ownedLiteral)]/
+[for (ownedLiteral)]
 	[CppElementDoc()/]
-	[name/][if hasStereotype(CppInit)] = [getApplication(CppInit).oclAsType(CppInit).value/][/if],

-[/for]

-};

-

+	[name/][if hasStereotype(CppInit)] = [getApplication(CppInit).oclAsType(CppInit).value/][/if],
+[/for]
+};
+
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl
index 28072961454..e8adc6eb5c6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl
@@ -1,4 +1,4 @@
-[module CppPrimitiveTypes('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppPrimitiveTypes('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
 
@@ -25,5 +25,5 @@ typedef [getApplication(Typedef).oclAsType(Typedef).definition.replaceAll('typeN
 	/][if (not getApplication(Typedef).oclAsType(Typedef).definition.contains('typeName'))] [primitiveType.name/][/if];
 [else]
 [getStdtypes(primitiveType)/];
-[/if]

+[/if]
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl
index 0cb88942a45..d7c7786cc02 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppTemplates.mtl
@@ -17,10 +17,22 @@ endif
 
 [template public templateSignature(class : Classifier)]
 [if isTemplate()]
-template<[for (getTemplateParameters()) separator(', ')][getType()/][/for]> [/if]
+template<[for (getTemplateParameters()) separator(', ')][getType()/][/for]>
+[/if]
+[/template]
+
+
+[template public templateShortSignature(class : Classifier)]
+[if isTemplate()]
+<[for (getTemplateParameters()) separator(', ')][getName()/][/for]> [/if]
 [/template]
 
 
 [template public templateSignature(operation : Operation)]
 [owner.oclAsType(Classifier).templateSignature()/]
+[/template]
+
+
+[template public templateShortSignature(operation : Operation)]
+[owner.oclAsType(Classifier).templateShortSignature()/]
 [/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl
index 0b184a07bc2..b3e0089002a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl
@@ -1,6 +1,6 @@
 [module CppClassAttributesDeclaration('http://www.eclipse.org/uml2/4.0.0/UML')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::property::CppAttributeDeclaration/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/]
 
 
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl
index 8477e8483dc..8b7b07755d8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl
@@ -3,7 +3,7 @@
 
 
 [template public CppClassFriendDeclaration(friend : Classifier)]
-friend class [friend.qualifiedName()/];

+friend class [friend.qualifiedName()/];
 [/template]
 
 [template public CppClassIncludeFriendDeclaration(class : Classifier)]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
index 8db26305532..c2e57b0864c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
@@ -1,13 +1,13 @@
-[module CppClassIncludeClassDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassIncludeClassDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeDeclaration/]
 
 [comment USED??? /]
 [template public CppClassIncludeClassDeclarationTemplate(class : Class)]
-[openNS()/]

-[if hasStereotype(class, 'CppTemplate.class')]template [/if]class [class.name/];

-[closeNS()/]

+[openNS()/]
+[if hasStereotype(class, 'CppTemplate.class')]template [/if]class [class.name/];
+[closeNS()/]
 [/template]
 
 
@@ -21,7 +21,15 @@
 
 
 [template public CppClassAllIncludesDeclaration(class : Classifier)]
-[for (cl : Classifier | includedClassifiers())]
+[CppClassAllIncludesDeclaration(includedClassifiers())/]
+[/template]
+
+[template public CppClassAllIncludesDeclarationBody(class : Classifier)]
+[CppClassAllIncludesDeclaration(getDependencies())/]
+[/template]
+
+[template public CppClassAllIncludesDeclaration(class : Classifier, list : Sequence(Classifier) )]
+[for (cl : Classifier | list)]
 	[comment Only add include if this is not for the current class and if it does not have the stereotype "CppNoCodeGen", unless
 			it has stereotype "CppExternalClass"/]
 	[if((cl <> class) and (not hasStereotype(NoCodeGen)) or hasStereotype(ExternClass))]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
index 9634496107a..6086e5d1951 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
@@ -1,4 +1,4 @@
-[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
 
@@ -8,12 +8,14 @@ if (hasStereotype(Template)) then
 	getApplication(Template).oclAsType(Template).declaration
 else
 	if (hasStereotype(ExternClass)) then getApplication(ExternClass).oclAsType(ExternClass).name
-	else ne.name + '.' + getHeaderSuffix()
+	else
+		-- standard case (no stereotypes are applied)
+		getNearestPackage().getFullPath() + '/' + ne.name + '.' + getHeaderSuffix()
 	endif
 endif
 /]
 
 [comment TODO: original code did not use nearest package, if stereotype CppRoot was applied/]
 [template public CppClassIncludeDeclaration(ne : NamedElement)]
-#include <[getNearestPackage().getFullPath()/]/[ne.includeName()/]>

+#include <[ne.includeName()/]>
 [/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl
index 22eb62b8de0..bc74fb1d96d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl
@@ -1,4 +1,4 @@
-[module CppClassInheritedDeclarations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassInheritedDeclarations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 
 [comment
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl
index e15580adddf..fc53a585cb6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl
@@ -1,6 +1,6 @@
 [module CppClassOperationsDeclaration('http://www.eclipse.org/uml2/4.0.0/UML')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperationDeclaration/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
 
 
 [template public CppClassOperationsDeclaration(class : Classifier, visibilityFilter : VisibilityKind)]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl
index aeaf01f3fe6..c39be30ad8d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl
@@ -1,6 +1,6 @@
-[module CppClassOperationsImplementation('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassOperationsImplementation('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperationDeclaration/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
 
 
 [comment implementations of a classifier, parameter controls whether only inline (or only not inline) operations
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl
index 50f2a7c4928..aabc4832534 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl
@@ -1,4 +1,4 @@
-[module CppClassTypeAndEnum('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassTypeAndEnum('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppPrimitiveTypes/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppEnumerations/]
@@ -20,7 +20,7 @@
   protected:
 	[TypesAndEnumsForVisibility(VisibilityKind::protected)/]
   private:
-	[TypesAndEnumsForVisibility(VisibilityKind::private)/]

+	[TypesAndEnumsForVisibility(VisibilityKind::private)/]
 [/template]
 
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperationDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
index f37e2687c9d..81c80bce0db 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperationDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
@@ -1,4 +1,4 @@
-[module CppOperationDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1', 'http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2')/]
+[module CppOperations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1', 'http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
@@ -17,25 +17,22 @@
 
 
 [query public ConsDestructorOrVoid(operation : Operation) : String =
-if (hasStereotype(l2::Create)) then
+if hasStereotype(l2::Create) or hasStereotype(l2::Destroy) then
 	''
 else
-	if (hasStereotype(l2::Destroy)) then
-		'~'
-	else
-		'void '
-	endif
-endif
-/]
+	'void '
+endif/]
 
 
-[template public CppReturnSpec(operation : Operation)]
-[modConst()/][if (type = null)][ConsDestructorOrVoid()/][else][type.qualifiedName()/] [/if][returnResult().modPtr()/][returnResult().modRef()/]
-[/template]
-
+[query public destructor(operation : Operation) : String =
+if hasStereotype(l2::Destroy) then
+	'~'
+else
+	''
+endif/]
 
-[template public CppConstOp(operation : Operation)]
-[if (hasStereotype(operation, 'Const'))] const[/if]
+[template public CppReturnSpec(operation : Operation)]
+[if (type = null)][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.qualifiedName()/] [/if][returnResult().modPtr()/][returnResult().modRef()/]
 [/template]
 
 
@@ -49,8 +46,8 @@ endif
 [/template]
 
 [template public CppOperationDeclaration(operation : Operation)]
-[CppOperationDoc()/]

-[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/] [operation.name/]([CppOperationParameters()/])[CppConstOp()/][virtualSuffix()/];

+[CppOperationDoc()/]
+[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/] [destructor()/][operation.name/]([CppOperationParameters(true)/])[modConst()/][virtualSuffix()/];
 [/template]
 
 
@@ -68,11 +65,11 @@ endif
 [template public CppOperationImplementation(operation : Operation)]
 [CppOperationDoc()/]
 [if (operation.name = 'main')]
-[CppReturnSpec()/][operation.name/]([CppOperationParameters()/]) {
+[CppReturnSpec()/][operation.name/]([CppOperationParameters(false)/]) {
 	[getBody('C/C++')/]
 }
 [else]
-[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.class.name/]::[operation.name/]([CppOperationParameters()/])[CppConstOp()/][CppConstInit()/] {
+[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.class.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[modConst()/][CppConstInit()/] {
 	[getBodyInTemplate('C/C++')/]
 }
 [/if]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
index 5b5e08e92ca..bf013aa089f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
@@ -8,11 +8,13 @@
 [if (hasStereotype(C_Cpp::Default))] = [getApplication(C_Cpp::Default).oclAsType(C_Cpp::Default).value/][/if]
 [/template]
 
-[template public CppParameter(parameter : Parameter)]
-[modConst()/][parameter.type.qualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][defaultValue()/]
+[comment C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
+	may not repeat default value)/]
+[template public CppParameter(parameter : Parameter, showDefault : Boolean)]
+[modConst()/][parameter.type.qualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if]
 [/template]
 
 
-[template public CppOperationParameters(operation : Operation)]
-[for (ownedParameter->select(direction <> ParameterDirectionKind::return)) separator(', ')][CppParameter()/][/for]
+[template public CppOperationParameters(operation : Operation, showDefault : Boolean)]
+[for (ownedParameter->select(direction <> ParameterDirectionKind::return)) separator(', ')][CppParameter(showDefault)/][/for]
 [/template]
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/property/CppAttributeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/property/CppAttributeDeclaration.mtl
deleted file mode 100644
index 9a22ee68143..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/property/CppAttributeDeclaration.mtl
+++ /dev/null
@@ -1,21 +0,0 @@
-[module CppAttributeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML')/]
-[import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
-[import org::eclipse::papyrus::cpp::codegen::utils::Modifier/]
-[import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
-
-
-
-
-[template public defaultValue(attribute : Property)]
-[if (defaultValue <> null) and isStatic] = [attribute.defaultValue.stringValue()/][/if]
-[/template]
-
-[template public staticValue(attribute : Property)]
-[if (attribute.isStatic)]static [/if]
-[/template]
-
-[template public CppAttributeDeclaration(attribute : Property)]

-[CppElementDoc()/]

-[staticValue()/][modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][defaultValue()/];
-[/template]
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 7eb3b2ad5d8..c2fdc6c21c7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -15,6 +15,12 @@ import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.papyrus.C_Cpp.CppRoot;

+import org.eclipse.papyrus.C_Cpp.ExternClass;

+import org.eclipse.papyrus.C_Cpp.Include;

+import org.eclipse.papyrus.C_Cpp.ManualGeneration;

+import org.eclipse.papyrus.C_Cpp.NoCodeGen;

+import org.eclipse.papyrus.C_Cpp.Template;

 import org.eclipse.papyrus.acceleo.AcceleoDriver;

 import org.eclipse.papyrus.acceleo.ModelElementsCreator;

 import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;

@@ -26,13 +32,6 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 

-import C_Cpp.CppRoot;

-import C_Cpp.ExternClass;

-import C_Cpp.Include;

-import C_Cpp.ManualGeneration;

-import C_Cpp.NoCodeGen;

-import C_Cpp.Template;

-

 

 

 /**

@@ -120,6 +119,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 

 			// Template Bound Class

 			if(GenUtils.isTemplateBoundElement(classifier)) {

+				// TODO: Acceleo template is only defined for class (not for all classifiers)

 				String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindHeader, classifier);

 				createFile(container, classifier.getName() + "." + hppExt, fileContent, true);

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
index 301851b5be8..2937137eff4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/ClassUtils.java
@@ -13,11 +13,10 @@ package org.eclipse.papyrus.cpp.codegen.utils;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.UniqueEList;
+import org.eclipse.papyrus.C_Cpp.Include;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 
-import C_Cpp.Include;
-
 /**
  * A set of utility functions related to classes.
  * 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
index 262f936116c..22f8be68f2b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
@@ -20,6 +20,10 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.C_Cpp.ExternClass;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.C_Cpp.Typedef;
+import org.eclipse.papyrus.C_Cpp.Visibility;
 import org.eclipse.papyrus.cpp.codegen.Constants;
 import org.eclipse.uml2.uml.AggregationKind;
 import org.eclipse.uml2.uml.Behavior;
@@ -52,11 +56,6 @@ import org.eclipse.uml2.uml.TemplateParameter;
 import org.eclipse.uml2.uml.TemplateSignature;
 import org.eclipse.uml2.uml.Type;
 
-import C_Cpp.ExternClass;
-import C_Cpp.NoCodeGen;
-import C_Cpp.Typedef;
-import C_Cpp.Visibility;
-
 
 
 /**
@@ -88,14 +87,19 @@ public class GenUtils {
 		return binding;
 	}
 
+	/**
+	 * Check whether the passed classifier has a template binding with itself as bound element
+	 *
+	 * @param cl
+	 * @return
+	 */
 	public static boolean isTemplateBoundElement(Classifier cl) {
 		boolean result = false;
-		EList<TemplateBinding> tb = cl.getTemplateBindings();
-		if(tb != null) {
-			Iterator<TemplateBinding> itb = tb.iterator();
-			while(itb.hasNext()) {
-				TemplateBinding currentTb = itb.next();
-				result = currentTb.getBoundElement() == cl;
+		EList<TemplateBinding> tbs = cl.getTemplateBindings();
+		if(tbs.size() > 0) {
+			for (TemplateBinding tb : tbs) {
+				// TODO: will only work for single element in template binding list
+				result = tb.getBoundElement() == cl;
 			}
 		}
 		return result;
@@ -525,7 +529,7 @@ public class GenUtils {
 		String commentText = "";
 		for(Comment comment : element.getOwnedComments()) {
 			// remove eventual CRs (avoid confusion in Acceleo template which adds " *" after line breaks)
-			commentText += comment.getBody().replace("\r", "");
+			commentText += cleanCR(comment.getBody());
 		}
 		return commentText;
 	}
@@ -735,8 +739,8 @@ public class GenUtils {
 				for(String language : ob.getLanguages()) {
 					String body = bodies.next();
 					if(language.equals(selectedLanguage)) {
-						// additional "\r" confuse Acceleo
-						return body.replace("\r", "");
+						// additional "\r" confuses Acceleo
+						return cleanCR(body);
 					}
 				}
 			}
@@ -745,6 +749,15 @@ public class GenUtils {
 	}
 	
 	/**
+	 * Remove <CR> from a String. These confuse Acceleo's indentation
+	 * @param str
+	 * @return
+	 */
+	public static String cleanCR(String str) {
+		return str.replace("\r", "");
+	}
+	
+	/**
 	 * Return the C++ visibility (on generalizations) in text form. Return public, if no stereotype
 	 * visibility exists
 	 *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.mtl
index c0bc93115e4..9393cad7538 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.mtl
@@ -52,7 +52,7 @@
 [query public getComments(arg0 : Element) : String
 	= invoke('org.eclipse.papyrus.cpp.codegen.utils.GenUtils', 'getComments(org.eclipse.uml2.uml.Element)', Sequence{arg0}) /]
 
-[query public getDependencies(arg0 : Classifier) : Sequence(Dependency)
+[query public getDependencies(arg0 : Classifier) : Sequence(Classifier)
 	= invoke('org.eclipse.papyrus.cpp.codegen.utils.GenUtils', 'getDependencies(org.eclipse.uml2.uml.Classifier)', Sequence{arg0}) /]
 
 [query public setStereotype(arg0 : Element, arg1 : String, arg2 : Boolean) : OclVoid
@@ -102,3 +102,6 @@
 
 [query public getUsedClassifiers(arg0 : Classifier) : Sequence(Classifier)
 	= invoke('org.eclipse.papyrus.cpp.codegen.utils.GenUtils', 'getUsedClassifiers(org.eclipse.uml2.uml.Classifier)', Sequence{arg0}) /]
+
+[query public cleanCR(arg0 : String) : String
+	= invoke('org.eclipse.papyrus.cpp.codegen.utils.GenUtils', 'cleanCR(java.lang.String)', Sequence{arg0}) /]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
index c9579d7aead..0120620a565 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
@@ -11,19 +11,19 @@
 
 package org.eclipse.papyrus.cpp.codegen.utils;
 
+import org.eclipse.papyrus.C_Cpp.Array;
+import org.eclipse.papyrus.C_Cpp.Const;
+import org.eclipse.papyrus.C_Cpp.Ptr;
+import org.eclipse.papyrus.C_Cpp.Ref;
 import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
 import org.eclipse.uml2.uml.AggregationKind;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.MultiplicityElement;
+import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.ParameterDirectionKind;
 import org.eclipse.uml2.uml.Property;
 
-import C_Cpp.Array;
-import C_Cpp.Const;
-import C_Cpp.Ptr;
-import C_Cpp.Ref;
-
 
 /**
  * Utility functions managing the "modifier" of an element, i.e. additional information whether a passed
@@ -65,66 +65,73 @@ public class Modifier {
 	/**
 	 * Create instance and initialize the ptr/ref/array/isConst attributes.
 	 * 
-	 * @param propertyOrParameter
+	 * @param propertyOperationOrParameter
 	 */
-	public static void update(Element propertyOrParameter) {
+	public static void update(Element propertyOperationOrParameter) {
 
 		// Pointer
-		Ptr cppPtr = GenUtils.getApplication(propertyOrParameter, Ptr.class);
+		Ptr cppPtr = GenUtils.getApplication(propertyOperationOrParameter, Ptr.class);
 		if(cppPtr != null) {
-			ptr = (cppPtr.getDeclaration() != null) ? cppPtr.getDeclaration() : "*";
+			ptr = (cppPtr.getDeclaration() != null) ? cppPtr.getDeclaration() : "*"; //$NON-NLS-1$
 		} else {
-			ptr = "";
+			ptr = ""; //$NON-NLS-1$
 		}
-		if (propertyOrParameter instanceof Property) {
-			if (((Property) propertyOrParameter).getAggregation() == AggregationKind.SHARED_LITERAL) {
-				ptr += "*";
+		if (propertyOperationOrParameter instanceof Property) {
+			if (((Property) propertyOperationOrParameter).getAggregation() == AggregationKind.SHARED_LITERAL) {
+				ptr += "*"; //$NON-NLS-1$
 			}
 		}
 		// Ref
-		ref = GenUtils.hasStereotype(propertyOrParameter, Ref.class) ? "&" : "";
-		boolean ptrOrRef = GenUtils.hasStereotype(propertyOrParameter, Ref.class) ||
-			GenUtils.hasStereotype(propertyOrParameter, Ptr.class);
+		ref = GenUtils.hasStereotype(propertyOperationOrParameter, Ref.class) ? "&" : ""; //$NON-NLS-1$ //$NON-NLS-2$
+		boolean ptrOrRef = GenUtils.hasStereotype(propertyOperationOrParameter, Ref.class) ||
+			GenUtils.hasStereotype(propertyOperationOrParameter, Ptr.class);
 
 		// Array
-		Array cppArray = GenUtils.getApplication(propertyOrParameter, Array.class);
+		Array cppArray = GenUtils.getApplication(propertyOperationOrParameter, Array.class);
 		if(cppArray != null) {
 			// explicit array definition
-			array = (cppArray.getDefinition() != null) ? cppArray.getDefinition() : "[]";
+			array = (cppArray.getDefinition() != null) ? cppArray.getDefinition() : "[]"; //$NON-NLS-1$
 		} else {
 			// calculate array from multiplicity definition
 			int multiplicity = 1;
-			if(propertyOrParameter instanceof MultiplicityElement) {
-				multiplicity = ((MultiplicityElement)propertyOrParameter).getUpper();
+			if(propertyOperationOrParameter instanceof MultiplicityElement) {
+				multiplicity = ((MultiplicityElement)propertyOperationOrParameter).getUpper();
 			}
-			array = "";
+			array = ""; //$NON-NLS-1$
 			if(multiplicity == -1) {
-				ptr += "*";
+				ptr += "*"; //$NON-NLS-1$
 			} else if(multiplicity > 1) {
-				array = "[" + multiplicity + "]";
+				array = "[" + multiplicity + "]"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 
 		// out an inout parameter are realized by means of a pointer 
-		if(propertyOrParameter instanceof Parameter) {
-			ParameterDirectionKind directionKind = ((Parameter)propertyOrParameter).getDirection();
+		if(propertyOperationOrParameter instanceof Parameter) {
+			ParameterDirectionKind directionKind = ((Parameter)propertyOperationOrParameter).getDirection();
 			if(directionKind == ParameterDirectionKind.IN_LITERAL) {
-				ptr += " _IN_";
+				ptr += " _IN_"; //$NON-NLS-1$
 			}
 			else if(directionKind == ParameterDirectionKind.OUT_LITERAL) {
-				ptr += " _OUT_";
+				ptr += " _OUT_"; //$NON-NLS-1$
 				if(!ptrOrRef) {
 					ptr += CppCodeGenUtils.getOutInoutOp();
 				}
 			}
 			else if(directionKind == ParameterDirectionKind.INOUT_LITERAL) {
-				ptr += " _INOUT_";
+				ptr += " _INOUT_"; //$NON-NLS-1$
 				if(!ptrOrRef) {
 					ptr += CppCodeGenUtils.getOutInoutOp();
 				}
 			}
 		}
 		// Const
-		isConst = GenUtils.hasStereotype(propertyOrParameter, Const.class) ? "const " : "";
+		if (GenUtils.hasStereotype(propertyOperationOrParameter, Const.class)) {
+			isConst = (propertyOperationOrParameter instanceof Operation) ?
+				" const" :	// added at the end of operation, prefix with " " //$NON-NLS-1$
+				"const ";	// before operation or parameter, postfix with " " //$NON-NLS-1$
+		}
+		else {
+			isConst = ""; //$NON-NLS-1$
+		}
 	}
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index a53c3d8835a..c7c3666f32a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: C_Cpp,
- C_Cpp.impl,
- C_Cpp.util,
+Export-Package: org.eclipse.papyrus.C_Cpp,
+ org.eclipse.papyrus.C_Cpp.impl,
+ org.eclipse.papyrus.C_Cpp.util,
  org.eclipse.papyrus.cpp.profile
 Bundle-Localization: plugin
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml
index 9c8f043f6f6..800e7e1412a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/plugin.xml
@@ -4,26 +4,26 @@
 	<extension

 			point="org.eclipse.emf.ecore.uri_mapping">

 		<mapping

-			source="pathmap://PapyrusCpp_LIBRARIES/"

+			source="pathmap://PapyrusC_Cpp_LIBRARIES/"

 			target="platform:/plugin/org.eclipse.papyrus.cpp.profile/libraries/"/>

 		<mapping

-			source="pathmap://PapyrusCpp_PROFILES/"

+			source="pathmap://PapyrusC_Cpp_PROFILES/"

 			target="platform:/plugin/org.eclipse.papyrus.cpp.profile/profiles/"/>

 	</extension>

   

 	<extension

 			point="org.eclipse.emf.ecore.generated_package">

 		<package 

-			uri="http://papyrus/C_CppProfile/1"

-			class = "C_Cpp.C_CppPackage"

+			uri="http://www.eclipse.org/papyrus/C_Cpp/1"

+			class = "org.eclipse.papyrus.C_Cpp.C_CppPackage"

 			genModel = "profile/C_Cpp.genmodel"/> 

 	</extension>

   

 	<extension 

 			point="org.eclipse.uml2.uml.generated_package">

 		<profile

-			uri="http://papyrus/C_CppProfile/1"

-			location="pathmap://PapyrusCpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>

+			uri="http://www.eclipse.org/papyrus/C_Cpp/1"

+			location="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>

 	</extension>

 

 	<extension

@@ -32,7 +32,7 @@
 			description="Standard C Ansi types"

 			iconpath="icons/transfo_cpp.gif"

 			name="AnsiCLibrary"

-			path="pathmap://PapyrusCpp_LIBRARIES/AnsiCLibrary.uml"

+			path="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml"

 			provider="CEA LIST"/>

 	</extension>

    

@@ -41,8 +41,8 @@
 		<profile

 			description="C/C++ profile used for code generation"

 			iconpath="icons/transfo_cpp.gif"

-			name="PapyrusCpp"

-			path="pathmap://PapyrusCpp_PROFILES/C_Cpp.profile.uml"

+			name="C/C++ profile"

+			path="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml"

 			provider="CEA LIST"/>

 	</extension>

 </plugin>

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
index 3eef26f2791..ebd964a1b51 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage 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" name="C_Cpp" nsURI="http://papyrus/C_CppProfile/1" nsPrefix="C_Cpp">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="C_Cpp" nsURI="http://www.eclipse.org/papyrus/C_Cpp/1" nsPrefix="C_Cpp">
   <eClassifiers xsi:type="ecore:EClass" name="Ptr">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="&quot;declaration&quot; attribute should only be used, if more than one indirections of pointers (often &quot;**&quot;)"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index 04a5cc75f9a..25c422d0fb4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
@@ -4,7 +4,8 @@
     modelName="C_Cpp" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
     copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
   <foreignModel>C_Cpp.ecore</foreignModel>
-  <genPackages prefix="C_Cpp" resource="XML" disposableProviderFactory="true" ecorePackage="C_Cpp.ecore#/">
+  <genPackages prefix="C_Cpp" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"
+      ecorePackage="C_Cpp.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//VisibilityKind">
       <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/private"/>
       <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/protected"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
index 177ff8951fa..3500a9bd9ef 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
@@ -394,5 +394,5 @@
       <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
   </uml:Profile>
-  <Ecore:EPackage xmi:id="_RRUXwMogEeGKstsYRuxdvw" base_Package="_j9REUByGEduN1bTiWJ0lyw" packageName="C_Cpp" nsPrefix="C_Cpp" nsURI="http://papyrus/C_CppProfile/1" prefix="C_Cpp"/>
+  <Ecore:EPackage xmi:id="_RRUXwMogEeGKstsYRuxdvw" base_Package="_j9REUByGEduN1bTiWJ0lyw" packageName="C_Cpp" nsPrefix="C_Cpp" nsURI="http://www.eclipse.org/papyrus/C_Cpp/1" prefix="C_Cpp"/>
 </xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Array.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
index b2c809dccc2..71ddfba49c0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Array.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -16,14 +16,14 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Array#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.Array#getDefinition <em>Definition</em>}</li>
- *   <li>{@link C_Cpp.Array#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.Array#getBase_association <em>Base association</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Array#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Array#getDefinition <em>Definition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Array#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Array#getBase_association <em>Base association</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getArray()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface Array extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
-	 * @see C_Cpp.C_CppPackage#getArray_Base_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_parameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Array#getBase_parameter <em>Base parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_parameter <em>Base parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base parameter</em>' reference.
@@ -64,14 +64,14 @@ public interface Array extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Definition</em>' attribute.
 	 * @see #setDefinition(String)
-	 * @see C_Cpp.C_CppPackage#getArray_Definition()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Definition()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getDefinition();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Array#getDefinition <em>Definition</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Array#getDefinition <em>Definition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Definition</em>' attribute.
@@ -90,14 +90,14 @@ public interface Array extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
-	 * @see C_Cpp.C_CppPackage#getArray_Base_property()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_property()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Array#getBase_property <em>Base property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_property <em>Base property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base property</em>' reference.
@@ -116,14 +116,14 @@ public interface Array extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base association</em>' reference.
 	 * @see #setBase_association(Association)
-	 * @see C_Cpp.C_CppPackage#getArray_Base_association()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_association()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Association getBase_association();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Array#getBase_association <em>Base association</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_association <em>Base association</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base association</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/C_CppFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index 8cd12a9eb63..428255289d7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/C_CppFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage
  * @generated
  */
 public interface C_CppFactory extends EFactory {
@@ -19,7 +19,7 @@ public interface C_CppFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	C_CppFactory eINSTANCE = C_Cpp.impl.C_CppFactoryImpl.init();
+	C_CppFactory eINSTANCE = org.eclipse.papyrus.C_Cpp.impl.C_CppFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Ptr</em>'.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/C_CppPackage.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
index d67566de80f..6e86b8eb2e6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/C_CppPackage.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppFactory
+ * @see org.eclipse.papyrus.C_Cpp.C_CppFactory
  * @model kind="package"
  * @generated
  */
@@ -38,7 +38,7 @@ public interface C_CppPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://papyrus/C_CppProfile/1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/C_Cpp/1";
 
 	/**
 	 * The package namespace name.
@@ -54,14 +54,14 @@ public interface C_CppPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	C_CppPackage eINSTANCE = C_Cpp.impl.C_CppPackageImpl.init();
+	C_CppPackage eINSTANCE = org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.PtrImpl <em>Ptr</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.PtrImpl <em>Ptr</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.PtrImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getPtr()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.PtrImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getPtr()
 	 * @generated
 	 */
 	int PTR = 0;
@@ -103,11 +103,11 @@ public interface C_CppPackage extends EPackage {
 	int PTR_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.IncludeImpl <em>Include</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl <em>Include</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.IncludeImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getInclude()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.IncludeImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getInclude()
 	 * @generated
 	 */
 	int INCLUDE = 1;
@@ -176,11 +176,11 @@ public interface C_CppPackage extends EPackage {
 	int INCLUDE_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ManualGenerationImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getManualGeneration()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getManualGeneration()
 	 * @generated
 	 */
 	int MANUAL_GENERATION = 2;
@@ -213,11 +213,11 @@ public interface C_CppPackage extends EPackage {
 	int MANUAL_GENERATION_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ArrayImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getArray()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
 	 * @generated
 	 */
 	int ARRAY = 3;
@@ -268,11 +268,11 @@ public interface C_CppPackage extends EPackage {
 	int ARRAY_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ConstImpl <em>Const</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ConstImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getConst()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
 	 * @generated
 	 */
 	int CONST = 4;
@@ -314,11 +314,11 @@ public interface C_CppPackage extends EPackage {
 	int CONST_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.DefaultImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getDefault()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.DefaultImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getDefault()
 	 * @generated
 	 */
 	int DEFAULT = 5;
@@ -360,11 +360,11 @@ public interface C_CppPackage extends EPackage {
 	int DEFAULT_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.RefImpl <em>Ref</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.RefImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getRef()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
 	 * @generated
 	 */
 	int REF = 6;
@@ -397,11 +397,11 @@ public interface C_CppPackage extends EPackage {
 	int REF_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ExternClassImpl <em>Extern Class</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl <em>Extern Class</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ExternClassImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getExternClass()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternClass()
 	 * @generated
 	 */
 	int EXTERN_CLASS = 7;
@@ -434,11 +434,11 @@ public interface C_CppPackage extends EPackage {
 	int EXTERN_CLASS_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ExternLibraryImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
 	 * @generated
 	 */
 	int EXTERN_LIBRARY = 8;
@@ -471,11 +471,11 @@ public interface C_CppPackage extends EPackage {
 	int EXTERN_LIBRARY_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.CppRootImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getCppRoot()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
 	 * @generated
 	 */
 	int CPP_ROOT = 9;
@@ -499,11 +499,11 @@ public interface C_CppPackage extends EPackage {
 	int CPP_ROOT_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.NoCodeGenImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
 	 * @generated
 	 */
 	int NO_CODE_GEN = 10;
@@ -527,11 +527,11 @@ public interface C_CppPackage extends EPackage {
 	int NO_CODE_GEN_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.ConstInitImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getConstInit()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConstInit()
 	 * @generated
 	 */
 	int CONST_INIT = 11;
@@ -564,11 +564,11 @@ public interface C_CppPackage extends EPackage {
 	int CONST_INIT_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.FriendImpl <em>Friend</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.FriendImpl <em>Friend</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.FriendImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getFriend()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.FriendImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getFriend()
 	 * @generated
 	 */
 	int FRIEND = 12;
@@ -601,11 +601,11 @@ public interface C_CppPackage extends EPackage {
 	int FRIEND_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.InlineImpl <em>Inline</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.InlineImpl <em>Inline</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.InlineImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getInline()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.InlineImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getInline()
 	 * @generated
 	 */
 	int INLINE = 13;
@@ -629,11 +629,11 @@ public interface C_CppPackage extends EPackage {
 	int INLINE_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.VirtualImpl <em>Virtual</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.VirtualImpl <em>Virtual</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.VirtualImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getVirtual()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.VirtualImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVirtual()
 	 * @generated
 	 */
 	int VIRTUAL = 14;
@@ -657,11 +657,11 @@ public interface C_CppPackage extends EPackage {
 	int VIRTUAL_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.TypedefImpl <em>Typedef</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TypedefImpl <em>Typedef</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.TypedefImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getTypedef()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.TypedefImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTypedef()
 	 * @generated
 	 */
 	int TYPEDEF = 15;
@@ -694,11 +694,11 @@ public interface C_CppPackage extends EPackage {
 	int TYPEDEF_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.VisibilityImpl <em>Visibility</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl <em>Visibility</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.VisibilityImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getVisibility()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibility()
 	 * @generated
 	 */
 	int VISIBILITY = 16;
@@ -731,11 +731,11 @@ public interface C_CppPackage extends EPackage {
 	int VISIBILITY_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.CppInitImpl <em>Cpp Init</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppInitImpl <em>Cpp Init</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.CppInitImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getCppInit()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.CppInitImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppInit()
 	 * @generated
 	 */
 	int CPP_INIT = 17;
@@ -768,11 +768,11 @@ public interface C_CppPackage extends EPackage {
 	int CPP_INIT_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.TemplateImpl <em>Template</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateImpl <em>Template</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.TemplateImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getTemplate()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplate()
 	 * @generated
 	 */
 	int TEMPLATE = 18;
@@ -805,11 +805,11 @@ public interface C_CppPackage extends EPackage {
 	int TEMPLATE_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.TemplateBindingImpl <em>Template Binding</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl <em>Template Binding</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.TemplateBindingImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getTemplateBinding()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateBinding()
 	 * @generated
 	 */
 	int TEMPLATE_BINDING = 19;
@@ -842,11 +842,11 @@ public interface C_CppPackage extends EPackage {
 	int TEMPLATE_BINDING_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.TemplateParameterImpl <em>Template Parameter</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl <em>Template Parameter</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.TemplateParameterImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getTemplateParameter()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateParameter()
 	 * @generated
 	 */
 	int TEMPLATE_PARAMETER = 20;
@@ -879,11 +879,11 @@ public interface C_CppPackage extends EPackage {
 	int TEMPLATE_PARAMETER_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.UnionImpl <em>Union</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.UnionImpl <em>Union</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.UnionImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getUnion()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.UnionImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getUnion()
 	 * @generated
 	 */
 	int UNION = 21;
@@ -907,11 +907,11 @@ public interface C_CppPackage extends EPackage {
 	int UNION_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.impl.StorageClassImpl <em>Storage Class</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl <em>Storage Class</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.impl.StorageClassImpl
-	 * @see C_Cpp.impl.C_CppPackageImpl#getStorageClass()
+	 * @see org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getStorageClass()
 	 * @generated
 	 */
 	int STORAGE_CLASS = 22;
@@ -935,831 +935,831 @@ public interface C_CppPackage extends EPackage {
 	int STORAGE_CLASS_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.VisibilityKind
-	 * @see C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
+	 * @see org.eclipse.papyrus.C_Cpp.VisibilityKind
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
 	 * @generated
 	 */
 	int VISIBILITY_KIND = 23;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.EAccessKind
-	 * @see C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
+	 * @see org.eclipse.papyrus.C_Cpp.EAccessKind
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
 	 * @generated
 	 */
 	int EACCESS_KIND = 24;
 
 	/**
-	 * The meta object id for the '{@link C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see C_Cpp.EStorageClass
-	 * @see C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
+	 * @see org.eclipse.papyrus.C_Cpp.EStorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
 	 * @generated
 	 */
 	int ESTORAGE_CLASS = 25;
 
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Ptr <em>Ptr</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Ptr <em>Ptr</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Ptr</em>'.
-	 * @see C_Cpp.Ptr
+	 * @see org.eclipse.papyrus.C_Cpp.Ptr
 	 * @generated
 	 */
 	EClass getPtr();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see C_Cpp.Ptr#getBase_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.Ptr#getBase_parameter()
 	 * @see #getPtr()
 	 * @generated
 	 */
 	EReference getPtr_Base_parameter();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Ptr#getBase_property <em>Base property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_property <em>Base property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see C_Cpp.Ptr#getBase_property()
+	 * @see org.eclipse.papyrus.C_Cpp.Ptr#getBase_property()
 	 * @see #getPtr()
 	 * @generated
 	 */
 	EReference getPtr_Base_property();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Ptr#getDeclaration <em>Declaration</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Ptr#getDeclaration <em>Declaration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Declaration</em>'.
-	 * @see C_Cpp.Ptr#getDeclaration()
+	 * @see org.eclipse.papyrus.C_Cpp.Ptr#getDeclaration()
 	 * @see #getPtr()
 	 * @generated
 	 */
 	EAttribute getPtr_Declaration();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Include <em>Include</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Include <em>Include</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Include</em>'.
-	 * @see C_Cpp.Include
+	 * @see org.eclipse.papyrus.C_Cpp.Include
 	 * @generated
 	 */
 	EClass getInclude();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Include#getBody <em>Body</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getBody <em>Body</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Body</em>'.
-	 * @see C_Cpp.Include#getBody()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getBody()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EAttribute getInclude_Body();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Include#getHeader <em>Header</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getHeader <em>Header</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Header</em>'.
-	 * @see C_Cpp.Include#getHeader()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getHeader()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EAttribute getInclude_Header();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Include#getBase_package <em>Base package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_package <em>Base package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base package</em>'.
-	 * @see C_Cpp.Include#getBase_package()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getBase_package()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EReference getInclude_Base_package();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Include#getBase_class <em>Base class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_class <em>Base class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base class</em>'.
-	 * @see C_Cpp.Include#getBase_class()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getBase_class()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EReference getInclude_Base_class();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base Package Import</em>'.
-	 * @see C_Cpp.Include#getBase_PackageImport()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getBase_PackageImport()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EReference getInclude_Base_PackageImport();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Include#getPreBody <em>Pre Body</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Pre Body</em>'.
-	 * @see C_Cpp.Include#getPreBody()
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getPreBody()
 	 * @see #getInclude()
 	 * @generated
 	 */
 	EAttribute getInclude_PreBody();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.ManualGeneration <em>Manual Generation</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration <em>Manual Generation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Manual Generation</em>'.
-	 * @see C_Cpp.ManualGeneration
+	 * @see org.eclipse.papyrus.C_Cpp.ManualGeneration
 	 * @generated
 	 */
 	EClass getManualGeneration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Extension Body</em>'.
-	 * @see C_Cpp.ManualGeneration#getExtensionBody()
+	 * @see org.eclipse.papyrus.C_Cpp.ManualGeneration#getExtensionBody()
 	 * @see #getManualGeneration()
 	 * @generated
 	 */
 	EAttribute getManualGeneration_ExtensionBody();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base Class</em>'.
-	 * @see C_Cpp.ManualGeneration#getBase_Class()
+	 * @see org.eclipse.papyrus.C_Cpp.ManualGeneration#getBase_Class()
 	 * @see #getManualGeneration()
 	 * @generated
 	 */
 	EReference getManualGeneration_Base_Class();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Array <em>Array</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Array <em>Array</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Array</em>'.
-	 * @see C_Cpp.Array
+	 * @see org.eclipse.papyrus.C_Cpp.Array
 	 * @generated
 	 */
 	EClass getArray();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Array#getBase_parameter <em>Base parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_parameter <em>Base parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see C_Cpp.Array#getBase_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.Array#getBase_parameter()
 	 * @see #getArray()
 	 * @generated
 	 */
 	EReference getArray_Base_parameter();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Array#getDefinition <em>Definition</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Array#getDefinition <em>Definition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Definition</em>'.
-	 * @see C_Cpp.Array#getDefinition()
+	 * @see org.eclipse.papyrus.C_Cpp.Array#getDefinition()
 	 * @see #getArray()
 	 * @generated
 	 */
 	EAttribute getArray_Definition();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Array#getBase_property <em>Base property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_property <em>Base property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see C_Cpp.Array#getBase_property()
+	 * @see org.eclipse.papyrus.C_Cpp.Array#getBase_property()
 	 * @see #getArray()
 	 * @generated
 	 */
 	EReference getArray_Base_property();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Array#getBase_association <em>Base association</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Array#getBase_association <em>Base association</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base association</em>'.
-	 * @see C_Cpp.Array#getBase_association()
+	 * @see org.eclipse.papyrus.C_Cpp.Array#getBase_association()
 	 * @see #getArray()
 	 * @generated
 	 */
 	EReference getArray_Base_association();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Const <em>Const</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Const <em>Const</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Const</em>'.
-	 * @see C_Cpp.Const
+	 * @see org.eclipse.papyrus.C_Cpp.Const
 	 * @generated
 	 */
 	EClass getConst();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Const#getBase_parameter <em>Base parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_parameter <em>Base parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see C_Cpp.Const#getBase_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.Const#getBase_parameter()
 	 * @see #getConst()
 	 * @generated
 	 */
 	EReference getConst_Base_parameter();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Const#getBase_property <em>Base property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_property <em>Base property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see C_Cpp.Const#getBase_property()
+	 * @see org.eclipse.papyrus.C_Cpp.Const#getBase_property()
 	 * @see #getConst()
 	 * @generated
 	 */
 	EReference getConst_Base_property();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Const#getBase_operation <em>Base operation</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_operation <em>Base operation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base operation</em>'.
-	 * @see C_Cpp.Const#getBase_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.Const#getBase_operation()
 	 * @see #getConst()
 	 * @generated
 	 */
 	EReference getConst_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Default <em>Default</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Default <em>Default</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Default</em>'.
-	 * @see C_Cpp.Default
+	 * @see org.eclipse.papyrus.C_Cpp.Default
 	 * @generated
 	 */
 	EClass getDefault();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Default#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see C_Cpp.Default#getValue()
+	 * @see org.eclipse.papyrus.C_Cpp.Default#getValue()
 	 * @see #getDefault()
 	 * @generated
 	 */
 	EAttribute getDefault_Value();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Default#getBase_parameter <em>Base parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see C_Cpp.Default#getBase_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.Default#getBase_parameter()
 	 * @see #getDefault()
 	 * @generated
 	 */
 	EReference getDefault_Base_parameter();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Default#getBase_property <em>Base property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see C_Cpp.Default#getBase_property()
+	 * @see org.eclipse.papyrus.C_Cpp.Default#getBase_property()
 	 * @see #getDefault()
 	 * @generated
 	 */
 	EReference getDefault_Base_property();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Ref <em>Ref</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Ref</em>'.
-	 * @see C_Cpp.Ref
+	 * @see org.eclipse.papyrus.C_Cpp.Ref
 	 * @generated
 	 */
 	EClass getRef();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see C_Cpp.Ref#getBase_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.Ref#getBase_parameter()
 	 * @see #getRef()
 	 * @generated
 	 */
 	EReference getRef_Base_parameter();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Ref#getBase_property <em>Base property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_property <em>Base property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see C_Cpp.Ref#getBase_property()
+	 * @see org.eclipse.papyrus.C_Cpp.Ref#getBase_property()
 	 * @see #getRef()
 	 * @generated
 	 */
 	EReference getRef_Base_property();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.ExternClass <em>Extern Class</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ExternClass <em>Extern Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Extern Class</em>'.
-	 * @see C_Cpp.ExternClass
+	 * @see org.eclipse.papyrus.C_Cpp.ExternClass
 	 * @generated
 	 */
 	EClass getExternClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.ExternClass#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.ExternClass#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see C_Cpp.ExternClass#getName()
+	 * @see org.eclipse.papyrus.C_Cpp.ExternClass#getName()
 	 * @see #getExternClass()
 	 * @generated
 	 */
 	EAttribute getExternClass_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.ExternClass#getBase_class <em>Base class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ExternClass#getBase_class <em>Base class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base class</em>'.
-	 * @see C_Cpp.ExternClass#getBase_class()
+	 * @see org.eclipse.papyrus.C_Cpp.ExternClass#getBase_class()
 	 * @see #getExternClass()
 	 * @generated
 	 */
 	EReference getExternClass_Base_class();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.ExternLibrary <em>Extern Library</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Extern Library</em>'.
-	 * @see C_Cpp.ExternLibrary
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
 	 * @generated
 	 */
 	EClass getExternLibrary();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.ExternLibrary#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see C_Cpp.ExternLibrary#getName()
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getName()
 	 * @see #getExternLibrary()
 	 * @generated
 	 */
 	EAttribute getExternLibrary_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base package</em>'.
-	 * @see C_Cpp.ExternLibrary#getBase_package()
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package()
 	 * @see #getExternLibrary()
 	 * @generated
 	 */
 	EReference getExternLibrary_Base_package();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.CppRoot <em>Cpp Root</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Cpp Root</em>'.
-	 * @see C_Cpp.CppRoot
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
 	 * @generated
 	 */
 	EClass getCppRoot();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.CppRoot#getBase_package <em>Base package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package <em>Base package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base package</em>'.
-	 * @see C_Cpp.CppRoot#getBase_package()
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package()
 	 * @see #getCppRoot()
 	 * @generated
 	 */
 	EReference getCppRoot_Base_package();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>No Code Gen</em>'.
-	 * @see C_Cpp.NoCodeGen
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
 	 * @generated
 	 */
 	EClass getNoCodeGen();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base element</em>'.
-	 * @see C_Cpp.NoCodeGen#getBase_element()
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element()
 	 * @see #getNoCodeGen()
 	 * @generated
 	 */
 	EReference getNoCodeGen_Base_element();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.ConstInit <em>Const Init</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ConstInit <em>Const Init</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Const Init</em>'.
-	 * @see C_Cpp.ConstInit
+	 * @see org.eclipse.papyrus.C_Cpp.ConstInit
 	 * @generated
 	 */
 	EClass getConstInit();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Initialisation</em>'.
-	 * @see C_Cpp.ConstInit#getInitialisation()
+	 * @see org.eclipse.papyrus.C_Cpp.ConstInit#getInitialisation()
 	 * @see #getConstInit()
 	 * @generated
 	 */
 	EAttribute getConstInit_Initialisation();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base operation</em>'.
-	 * @see C_Cpp.ConstInit#getBase_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.ConstInit#getBase_operation()
 	 * @see #getConstInit()
 	 * @generated
 	 */
 	EReference getConstInit_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Friend <em>Friend</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Friend <em>Friend</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Friend</em>'.
-	 * @see C_Cpp.Friend
+	 * @see org.eclipse.papyrus.C_Cpp.Friend
 	 * @generated
 	 */
 	EClass getFriend();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base dependency</em>'.
-	 * @see C_Cpp.Friend#getBase_dependency()
+	 * @see org.eclipse.papyrus.C_Cpp.Friend#getBase_dependency()
 	 * @see #getFriend()
 	 * @generated
 	 */
 	EReference getFriend_Base_dependency();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Friend#getBase_operation <em>Base operation</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_operation <em>Base operation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base operation</em>'.
-	 * @see C_Cpp.Friend#getBase_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.Friend#getBase_operation()
 	 * @see #getFriend()
 	 * @generated
 	 */
 	EReference getFriend_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Inline <em>Inline</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Inline <em>Inline</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Inline</em>'.
-	 * @see C_Cpp.Inline
+	 * @see org.eclipse.papyrus.C_Cpp.Inline
 	 * @generated
 	 */
 	EClass getInline();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Inline#getBase_operation <em>Base operation</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Inline#getBase_operation <em>Base operation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base operation</em>'.
-	 * @see C_Cpp.Inline#getBase_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.Inline#getBase_operation()
 	 * @see #getInline()
 	 * @generated
 	 */
 	EReference getInline_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Virtual <em>Virtual</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Virtual <em>Virtual</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Virtual</em>'.
-	 * @see C_Cpp.Virtual
+	 * @see org.eclipse.papyrus.C_Cpp.Virtual
 	 * @generated
 	 */
 	EClass getVirtual();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Virtual#getBase_operation <em>Base operation</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Virtual#getBase_operation <em>Base operation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base operation</em>'.
-	 * @see C_Cpp.Virtual#getBase_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.Virtual#getBase_operation()
 	 * @see #getVirtual()
 	 * @generated
 	 */
 	EReference getVirtual_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Typedef <em>Typedef</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Typedef <em>Typedef</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Typedef</em>'.
-	 * @see C_Cpp.Typedef
+	 * @see org.eclipse.papyrus.C_Cpp.Typedef
 	 * @generated
 	 */
 	EClass getTypedef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Typedef#getDefinition <em>Definition</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Typedef#getDefinition <em>Definition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Definition</em>'.
-	 * @see C_Cpp.Typedef#getDefinition()
+	 * @see org.eclipse.papyrus.C_Cpp.Typedef#getDefinition()
 	 * @see #getTypedef()
 	 * @generated
 	 */
 	EAttribute getTypedef_Definition();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base primitivetype</em>'.
-	 * @see C_Cpp.Typedef#getBase_primitivetype()
+	 * @see org.eclipse.papyrus.C_Cpp.Typedef#getBase_primitivetype()
 	 * @see #getTypedef()
 	 * @generated
 	 */
 	EReference getTypedef_Base_primitivetype();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Visibility <em>Visibility</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Visibility <em>Visibility</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Visibility</em>'.
-	 * @see C_Cpp.Visibility
+	 * @see org.eclipse.papyrus.C_Cpp.Visibility
 	 * @generated
 	 */
 	EClass getVisibility();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Visibility#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Visibility#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see C_Cpp.Visibility#getValue()
+	 * @see org.eclipse.papyrus.C_Cpp.Visibility#getValue()
 	 * @see #getVisibility()
 	 * @generated
 	 */
 	EAttribute getVisibility_Value();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base generalization</em>'.
-	 * @see C_Cpp.Visibility#getBase_generalization()
+	 * @see org.eclipse.papyrus.C_Cpp.Visibility#getBase_generalization()
 	 * @see #getVisibility()
 	 * @generated
 	 */
 	EReference getVisibility_Base_generalization();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.CppInit <em>Cpp Init</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.CppInit <em>Cpp Init</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Cpp Init</em>'.
-	 * @see C_Cpp.CppInit
+	 * @see org.eclipse.papyrus.C_Cpp.CppInit
 	 * @generated
 	 */
 	EClass getCppInit();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.CppInit#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.CppInit#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see C_Cpp.CppInit#getValue()
+	 * @see org.eclipse.papyrus.C_Cpp.CppInit#getValue()
 	 * @see #getCppInit()
 	 * @generated
 	 */
 	EAttribute getCppInit_Value();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base enumerationliteral</em>'.
-	 * @see C_Cpp.CppInit#getBase_enumerationliteral()
+	 * @see org.eclipse.papyrus.C_Cpp.CppInit#getBase_enumerationliteral()
 	 * @see #getCppInit()
 	 * @generated
 	 */
 	EReference getCppInit_Base_enumerationliteral();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Template <em>Template</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Template <em>Template</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Template</em>'.
-	 * @see C_Cpp.Template
+	 * @see org.eclipse.papyrus.C_Cpp.Template
 	 * @generated
 	 */
 	EClass getTemplate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.Template#getDeclaration <em>Declaration</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Template#getDeclaration <em>Declaration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Declaration</em>'.
-	 * @see C_Cpp.Template#getDeclaration()
+	 * @see org.eclipse.papyrus.C_Cpp.Template#getDeclaration()
 	 * @see #getTemplate()
 	 * @generated
 	 */
 	EAttribute getTemplate_Declaration();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Template#getBase_class <em>Base class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Template#getBase_class <em>Base class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base class</em>'.
-	 * @see C_Cpp.Template#getBase_class()
+	 * @see org.eclipse.papyrus.C_Cpp.Template#getBase_class()
 	 * @see #getTemplate()
 	 * @generated
 	 */
 	EReference getTemplate_Base_class();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.TemplateBinding <em>Template Binding</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding <em>Template Binding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Template Binding</em>'.
-	 * @see C_Cpp.TemplateBinding
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateBinding
 	 * @generated
 	 */
 	EClass getTemplateBinding();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.TemplateBinding#getBinding <em>Binding</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBinding <em>Binding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Binding</em>'.
-	 * @see C_Cpp.TemplateBinding#getBinding()
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateBinding#getBinding()
 	 * @see #getTemplateBinding()
 	 * @generated
 	 */
 	EAttribute getTemplateBinding_Binding();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base templatebinding</em>'.
-	 * @see C_Cpp.TemplateBinding#getBase_templatebinding()
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateBinding#getBase_templatebinding()
 	 * @see #getTemplateBinding()
 	 * @generated
 	 */
 	EReference getTemplateBinding_Base_templatebinding();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.TemplateParameter <em>Template Parameter</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter <em>Template Parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Template Parameter</em>'.
-	 * @see C_Cpp.TemplateParameter
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateParameter
 	 * @generated
 	 */
 	EClass getTemplateParameter();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.TemplateParameter#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see C_Cpp.TemplateParameter#getName()
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateParameter#getName()
 	 * @see #getTemplateParameter()
 	 * @generated
 	 */
 	EAttribute getTemplateParameter_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base templateparameter</em>'.
-	 * @see C_Cpp.TemplateParameter#getBase_templateparameter()
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateParameter#getBase_templateparameter()
 	 * @see #getTemplateParameter()
 	 * @generated
 	 */
 	EReference getTemplateParameter_Base_templateparameter();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.Union <em>Union</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Union <em>Union</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Union</em>'.
-	 * @see C_Cpp.Union
+	 * @see org.eclipse.papyrus.C_Cpp.Union
 	 * @generated
 	 */
 	EClass getUnion();
 
 	/**
-	 * Returns the meta object for the reference '{@link C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Base Data Type</em>'.
-	 * @see C_Cpp.Union#getBase_DataType()
+	 * @see org.eclipse.papyrus.C_Cpp.Union#getBase_DataType()
 	 * @see #getUnion()
 	 * @generated
 	 */
 	EReference getUnion_Base_DataType();
 
 	/**
-	 * Returns the meta object for class '{@link C_Cpp.StorageClass <em>Storage Class</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.StorageClass <em>Storage Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Storage Class</em>'.
-	 * @see C_Cpp.StorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.StorageClass
 	 * @generated
 	 */
 	EClass getStorageClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Storage Class</em>'.
-	 * @see C_Cpp.StorageClass#getStorageClass()
+	 * @see org.eclipse.papyrus.C_Cpp.StorageClass#getStorageClass()
 	 * @see #getStorageClass()
 	 * @generated
 	 */
 	EAttribute getStorageClass_StorageClass();
 
 	/**
-	 * Returns the meta object for enum '{@link C_Cpp.VisibilityKind <em>Visibility Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Visibility Kind</em>'.
-	 * @see C_Cpp.VisibilityKind
+	 * @see org.eclipse.papyrus.C_Cpp.VisibilityKind
 	 * @generated
 	 */
 	EEnum getVisibilityKind();
 
 	/**
-	 * Returns the meta object for enum '{@link C_Cpp.EAccessKind <em>EAccess Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.C_Cpp.EAccessKind <em>EAccess Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>EAccess Kind</em>'.
-	 * @see C_Cpp.EAccessKind
+	 * @see org.eclipse.papyrus.C_Cpp.EAccessKind
 	 * @generated
 	 */
 	EEnum getEAccessKind();
 
 	/**
-	 * Returns the meta object for enum '{@link C_Cpp.EStorageClass <em>EStorage Class</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.C_Cpp.EStorageClass <em>EStorage Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>EStorage Class</em>'.
-	 * @see C_Cpp.EStorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.EStorageClass
 	 * @generated
 	 */
 	EEnum getEStorageClass();
@@ -1787,11 +1787,11 @@ public interface C_CppPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.PtrImpl <em>Ptr</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.PtrImpl <em>Ptr</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.PtrImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getPtr()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.PtrImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getPtr()
 		 * @generated
 		 */
 		EClass PTR = eINSTANCE.getPtr();
@@ -1821,11 +1821,11 @@ public interface C_CppPackage extends EPackage {
 		EAttribute PTR__DECLARATION = eINSTANCE.getPtr_Declaration();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.IncludeImpl <em>Include</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl <em>Include</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.IncludeImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getInclude()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.IncludeImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getInclude()
 		 * @generated
 		 */
 		EClass INCLUDE = eINSTANCE.getInclude();
@@ -1879,11 +1879,11 @@ public interface C_CppPackage extends EPackage {
 		EAttribute INCLUDE__PRE_BODY = eINSTANCE.getInclude_PreBody();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ManualGenerationImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getManualGeneration()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getManualGeneration()
 		 * @generated
 		 */
 		EClass MANUAL_GENERATION = eINSTANCE.getManualGeneration();
@@ -1905,11 +1905,11 @@ public interface C_CppPackage extends EPackage {
 		EReference MANUAL_GENERATION__BASE_CLASS = eINSTANCE.getManualGeneration_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ArrayImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getArray()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
 		 * @generated
 		 */
 		EClass ARRAY = eINSTANCE.getArray();
@@ -1947,11 +1947,11 @@ public interface C_CppPackage extends EPackage {
 		EReference ARRAY__BASE_ASSOCIATION = eINSTANCE.getArray_Base_association();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ConstImpl <em>Const</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ConstImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getConst()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
 		 * @generated
 		 */
 		EClass CONST = eINSTANCE.getConst();
@@ -1981,11 +1981,11 @@ public interface C_CppPackage extends EPackage {
 		EReference CONST__BASE_OPERATION = eINSTANCE.getConst_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.DefaultImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getDefault()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.DefaultImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getDefault()
 		 * @generated
 		 */
 		EClass DEFAULT = eINSTANCE.getDefault();
@@ -2015,11 +2015,11 @@ public interface C_CppPackage extends EPackage {
 		EReference DEFAULT__BASE_PROPERTY = eINSTANCE.getDefault_Base_property();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.RefImpl <em>Ref</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.RefImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getRef()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
 		 * @generated
 		 */
 		EClass REF = eINSTANCE.getRef();
@@ -2041,11 +2041,11 @@ public interface C_CppPackage extends EPackage {
 		EReference REF__BASE_PROPERTY = eINSTANCE.getRef_Base_property();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ExternClassImpl <em>Extern Class</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl <em>Extern Class</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ExternClassImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getExternClass()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternClass()
 		 * @generated
 		 */
 		EClass EXTERN_CLASS = eINSTANCE.getExternClass();
@@ -2067,11 +2067,11 @@ public interface C_CppPackage extends EPackage {
 		EReference EXTERN_CLASS__BASE_CLASS = eINSTANCE.getExternClass_Base_class();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ExternLibraryImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
 		 * @generated
 		 */
 		EClass EXTERN_LIBRARY = eINSTANCE.getExternLibrary();
@@ -2093,11 +2093,11 @@ public interface C_CppPackage extends EPackage {
 		EReference EXTERN_LIBRARY__BASE_PACKAGE = eINSTANCE.getExternLibrary_Base_package();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.CppRootImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getCppRoot()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
 		 * @generated
 		 */
 		EClass CPP_ROOT = eINSTANCE.getCppRoot();
@@ -2111,11 +2111,11 @@ public interface C_CppPackage extends EPackage {
 		EReference CPP_ROOT__BASE_PACKAGE = eINSTANCE.getCppRoot_Base_package();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.NoCodeGenImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
 		 * @generated
 		 */
 		EClass NO_CODE_GEN = eINSTANCE.getNoCodeGen();
@@ -2129,11 +2129,11 @@ public interface C_CppPackage extends EPackage {
 		EReference NO_CODE_GEN__BASE_ELEMENT = eINSTANCE.getNoCodeGen_Base_element();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.ConstInitImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getConstInit()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConstInit()
 		 * @generated
 		 */
 		EClass CONST_INIT = eINSTANCE.getConstInit();
@@ -2155,11 +2155,11 @@ public interface C_CppPackage extends EPackage {
 		EReference CONST_INIT__BASE_OPERATION = eINSTANCE.getConstInit_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.FriendImpl <em>Friend</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.FriendImpl <em>Friend</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.FriendImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getFriend()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.FriendImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getFriend()
 		 * @generated
 		 */
 		EClass FRIEND = eINSTANCE.getFriend();
@@ -2181,11 +2181,11 @@ public interface C_CppPackage extends EPackage {
 		EReference FRIEND__BASE_OPERATION = eINSTANCE.getFriend_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.InlineImpl <em>Inline</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.InlineImpl <em>Inline</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.InlineImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getInline()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.InlineImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getInline()
 		 * @generated
 		 */
 		EClass INLINE = eINSTANCE.getInline();
@@ -2199,11 +2199,11 @@ public interface C_CppPackage extends EPackage {
 		EReference INLINE__BASE_OPERATION = eINSTANCE.getInline_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.VirtualImpl <em>Virtual</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.VirtualImpl <em>Virtual</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.VirtualImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getVirtual()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.VirtualImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVirtual()
 		 * @generated
 		 */
 		EClass VIRTUAL = eINSTANCE.getVirtual();
@@ -2217,11 +2217,11 @@ public interface C_CppPackage extends EPackage {
 		EReference VIRTUAL__BASE_OPERATION = eINSTANCE.getVirtual_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.TypedefImpl <em>Typedef</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.TypedefImpl <em>Typedef</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.TypedefImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getTypedef()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.TypedefImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTypedef()
 		 * @generated
 		 */
 		EClass TYPEDEF = eINSTANCE.getTypedef();
@@ -2243,11 +2243,11 @@ public interface C_CppPackage extends EPackage {
 		EReference TYPEDEF__BASE_PRIMITIVETYPE = eINSTANCE.getTypedef_Base_primitivetype();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.VisibilityImpl <em>Visibility</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl <em>Visibility</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.VisibilityImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getVisibility()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibility()
 		 * @generated
 		 */
 		EClass VISIBILITY = eINSTANCE.getVisibility();
@@ -2269,11 +2269,11 @@ public interface C_CppPackage extends EPackage {
 		EReference VISIBILITY__BASE_GENERALIZATION = eINSTANCE.getVisibility_Base_generalization();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.CppInitImpl <em>Cpp Init</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppInitImpl <em>Cpp Init</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.CppInitImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getCppInit()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.CppInitImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppInit()
 		 * @generated
 		 */
 		EClass CPP_INIT = eINSTANCE.getCppInit();
@@ -2295,11 +2295,11 @@ public interface C_CppPackage extends EPackage {
 		EReference CPP_INIT__BASE_ENUMERATIONLITERAL = eINSTANCE.getCppInit_Base_enumerationliteral();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.TemplateImpl <em>Template</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateImpl <em>Template</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.TemplateImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getTemplate()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplate()
 		 * @generated
 		 */
 		EClass TEMPLATE = eINSTANCE.getTemplate();
@@ -2321,11 +2321,11 @@ public interface C_CppPackage extends EPackage {
 		EReference TEMPLATE__BASE_CLASS = eINSTANCE.getTemplate_Base_class();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.TemplateBindingImpl <em>Template Binding</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl <em>Template Binding</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.TemplateBindingImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getTemplateBinding()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateBinding()
 		 * @generated
 		 */
 		EClass TEMPLATE_BINDING = eINSTANCE.getTemplateBinding();
@@ -2347,11 +2347,11 @@ public interface C_CppPackage extends EPackage {
 		EReference TEMPLATE_BINDING__BASE_TEMPLATEBINDING = eINSTANCE.getTemplateBinding_Base_templatebinding();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.TemplateParameterImpl <em>Template Parameter</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl <em>Template Parameter</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.TemplateParameterImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getTemplateParameter()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateParameter()
 		 * @generated
 		 */
 		EClass TEMPLATE_PARAMETER = eINSTANCE.getTemplateParameter();
@@ -2373,11 +2373,11 @@ public interface C_CppPackage extends EPackage {
 		EReference TEMPLATE_PARAMETER__BASE_TEMPLATEPARAMETER = eINSTANCE.getTemplateParameter_Base_templateparameter();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.UnionImpl <em>Union</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.UnionImpl <em>Union</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.UnionImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getUnion()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.UnionImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getUnion()
 		 * @generated
 		 */
 		EClass UNION = eINSTANCE.getUnion();
@@ -2391,11 +2391,11 @@ public interface C_CppPackage extends EPackage {
 		EReference UNION__BASE_DATA_TYPE = eINSTANCE.getUnion_Base_DataType();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.impl.StorageClassImpl <em>Storage Class</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl <em>Storage Class</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.impl.StorageClassImpl
-		 * @see C_Cpp.impl.C_CppPackageImpl#getStorageClass()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getStorageClass()
 		 * @generated
 		 */
 		EClass STORAGE_CLASS = eINSTANCE.getStorageClass();
@@ -2409,31 +2409,31 @@ public interface C_CppPackage extends EPackage {
 		EAttribute STORAGE_CLASS__STORAGE_CLASS = eINSTANCE.getStorageClass_StorageClass();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.VisibilityKind
-		 * @see C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
+		 * @see org.eclipse.papyrus.C_Cpp.VisibilityKind
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
 		 * @generated
 		 */
 		EEnum VISIBILITY_KIND = eINSTANCE.getVisibilityKind();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.EAccessKind
-		 * @see C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
+		 * @see org.eclipse.papyrus.C_Cpp.EAccessKind
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
 		 * @generated
 		 */
 		EEnum EACCESS_KIND = eINSTANCE.getEAccessKind();
 
 		/**
-		 * The meta object literal for the '{@link C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see C_Cpp.EStorageClass
-		 * @see C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
+		 * @see org.eclipse.papyrus.C_Cpp.EStorageClass
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
 		 * @generated
 		 */
 		EEnum ESTORAGE_CLASS = eINSTANCE.getEStorageClass();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Const.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
index 5367c98dfbf..bf0688c4103 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Const.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -16,13 +16,13 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Const#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.Const#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.Const#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Const#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Const#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Const#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getConst()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConst()
  * @model
  * @generated
  */
@@ -37,14 +37,14 @@ public interface Const extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
-	 * @see C_Cpp.C_CppPackage#getConst_Base_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConst_Base_parameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Const#getBase_parameter <em>Base parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_parameter <em>Base parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base parameter</em>' reference.
@@ -63,14 +63,14 @@ public interface Const extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
-	 * @see C_Cpp.C_CppPackage#getConst_Base_property()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConst_Base_property()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Const#getBase_property <em>Base property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_property <em>Base property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base property</em>' reference.
@@ -89,14 +89,14 @@ public interface Const extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base operation</em>' reference.
 	 * @see #setBase_operation(Operation)
-	 * @see C_Cpp.C_CppPackage#getConst_Base_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConst_Base_operation()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Operation getBase_operation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Const#getBase_operation <em>Base operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Const#getBase_operation <em>Base operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base operation</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ConstInit.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
index 8bb97f1d421..3429e05f11f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ConstInit.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,12 +14,12 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}</li>
- *   <li>{@link C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getConstInit()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConstInit()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface ConstInit extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Initialisation</em>' attribute.
 	 * @see #setInitialisation(String)
-	 * @see C_Cpp.C_CppPackage#getConstInit_Initialisation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConstInit_Initialisation()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getInitialisation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ConstInit#getInitialisation <em>Initialisation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Initialisation</em>' attribute.
@@ -60,14 +60,14 @@ public interface ConstInit extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base operation</em>' reference.
 	 * @see #setBase_operation(Operation)
-	 * @see C_Cpp.C_CppPackage#getConstInit_Base_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getConstInit_Base_operation()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Operation getBase_operation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ConstInit#getBase_operation <em>Base operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base operation</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/CppInit.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
index 0f8c6635d9e..34def7d4acb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/CppInit.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,12 +14,12 @@ import org.eclipse.uml2.uml.EnumerationLiteral;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.CppInit#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.CppInit#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getCppInit()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getCppInit()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface CppInit extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(int)
-	 * @see C_Cpp.C_CppPackage#getCppInit_Value()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getCppInit_Value()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.Integer" required="true" ordered="false"
 	 * @generated
 	 */
 	int getValue();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.CppInit#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.CppInit#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
@@ -60,14 +60,14 @@ public interface CppInit extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base enumerationliteral</em>' reference.
 	 * @see #setBase_enumerationliteral(EnumerationLiteral)
-	 * @see C_Cpp.C_CppPackage#getCppInit_Base_enumerationliteral()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getCppInit_Base_enumerationliteral()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	EnumerationLiteral getBase_enumerationliteral();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.CppInit#getBase_enumerationliteral <em>Base enumerationliteral</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base enumerationliteral</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/CppRoot.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
index d73fecd6f8d..238e6262904 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/CppRoot.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,11 +12,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.CppRoot#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package <em>Base package</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getCppRoot()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getCppRoot()
  * @model
  * @generated
  */
@@ -31,14 +31,14 @@ public interface CppRoot extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base package</em>' reference.
 	 * @see #setBase_package(org.eclipse.uml2.uml.Package)
-	 * @see C_Cpp.C_CppPackage#getCppRoot_Base_package()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getCppRoot_Base_package()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Package getBase_package();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.CppRoot#getBase_package <em>Base package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package <em>Base package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base package</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Default.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java
index 316f04400f5..ce9c8ac4c20 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Default.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -15,13 +15,13 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Default#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.Default#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.Default#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getDefault()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface Default extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
-	 * @see C_Cpp.C_CppPackage#getDefault_Value()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Value()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Default#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
@@ -62,14 +62,14 @@ public interface Default extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
-	 * @see C_Cpp.C_CppPackage#getDefault_Base_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Base_parameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Default#getBase_parameter <em>Base parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base parameter</em>' reference.
@@ -88,14 +88,14 @@ public interface Default extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
-	 * @see C_Cpp.C_CppPackage#getDefault_Base_property()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Base_property()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Default#getBase_property <em>Base property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base property</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/EAccessKind.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
index 33b0bcb5209..46b01e5dc4b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/EAccessKind.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>EAccess Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage#getEAccessKind()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getEAccessKind()
  * @model
  * @generated
  */
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/EStorageClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
index 548d7bd7f05..c3be77604f0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/EStorageClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>EStorage Class</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage#getEStorageClass()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getEStorageClass()
  * @model
  * @generated
  */
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ExternClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternClass.java
index 2082764930b..e39f2a04394 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ExternClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternClass.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,12 +12,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.ExternClass#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.ExternClass#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ExternClass#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ExternClass#getBase_class <em>Base class</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getExternClass()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternClass()
  * @model
  * @generated
  */
@@ -32,14 +32,14 @@ public interface ExternClass extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see C_Cpp.C_CppPackage#getExternClass_Name()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternClass_Name()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ExternClass#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ExternClass#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -58,14 +58,14 @@ public interface ExternClass extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base class</em>' reference.
 	 * @see #setBase_class(org.eclipse.uml2.uml.Class)
-	 * @see C_Cpp.C_CppPackage#getExternClass_Base_class()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternClass_Base_class()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Class getBase_class();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ExternClass#getBase_class <em>Base class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ExternClass#getBase_class <em>Base class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base class</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ExternLibrary.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
index 43ee8a202e7..2808e5ee2bb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ExternLibrary.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,12 +12,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.ExternLibrary#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getExternLibrary()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternLibrary()
  * @model
  * @generated
  */
@@ -32,14 +32,14 @@ public interface ExternLibrary extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see C_Cpp.C_CppPackage#getExternLibrary_Name()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternLibrary_Name()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ExternLibrary#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -58,14 +58,14 @@ public interface ExternLibrary extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base package</em>' reference.
 	 * @see #setBase_package(org.eclipse.uml2.uml.Package)
-	 * @see C_Cpp.C_CppPackage#getExternLibrary_Base_package()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getExternLibrary_Base_package()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Package getBase_package();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base package</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Friend.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
index 94ad97c1acd..1d36d297256 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Friend.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -15,12 +15,12 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}</li>
- *   <li>{@link C_Cpp.Friend#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getFriend()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getFriend()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface Friend extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base dependency</em>' reference.
 	 * @see #setBase_dependency(Dependency)
-	 * @see C_Cpp.C_CppPackage#getFriend_Base_dependency()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getFriend_Base_dependency()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Dependency getBase_dependency();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_dependency <em>Base dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base dependency</em>' reference.
@@ -61,14 +61,14 @@ public interface Friend extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base operation</em>' reference.
 	 * @see #setBase_operation(Operation)
-	 * @see C_Cpp.C_CppPackage#getFriend_Base_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getFriend_Base_operation()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Operation getBase_operation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Friend#getBase_operation <em>Base operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Friend#getBase_operation <em>Base operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base operation</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Include.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
index c9fa06ca764..71bf6fcc1cc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Include.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -18,16 +18,16 @@ import org.eclipse.uml2.uml.PackageImport;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Include#getBody <em>Body</em>}</li>
- *   <li>{@link C_Cpp.Include#getPreBody <em>Pre Body</em>}</li>
- *   <li>{@link C_Cpp.Include#getHeader <em>Header</em>}</li>
- *   <li>{@link C_Cpp.Include#getBase_package <em>Base package</em>}</li>
- *   <li>{@link C_Cpp.Include#getBase_class <em>Base class</em>}</li>
- *   <li>{@link C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getHeader <em>Header</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getInclude()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Body</em>' attribute.
 	 * @see #setBody(String)
-	 * @see C_Cpp.C_CppPackage#getInclude_Body()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_Body()
 	 * @model default="" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getBody();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getBody <em>Body</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getBody <em>Body</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Body</em>' attribute.
@@ -70,14 +70,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Header</em>' attribute.
 	 * @see #setHeader(String)
-	 * @see C_Cpp.C_CppPackage#getInclude_Header()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_Header()
 	 * @model default="" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getHeader();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getHeader <em>Header</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getHeader <em>Header</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Header</em>' attribute.
@@ -96,14 +96,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base package</em>' reference.
 	 * @see #setBase_package(org.eclipse.uml2.uml.Package)
-	 * @see C_Cpp.C_CppPackage#getInclude_Base_package()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_Base_package()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Package getBase_package();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getBase_package <em>Base package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_package <em>Base package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base package</em>' reference.
@@ -122,14 +122,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base class</em>' reference.
 	 * @see #setBase_class(org.eclipse.uml2.uml.Class)
-	 * @see C_Cpp.C_CppPackage#getInclude_Base_class()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_Base_class()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Class getBase_class();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getBase_class <em>Base class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_class <em>Base class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base class</em>' reference.
@@ -148,14 +148,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base Package Import</em>' reference.
 	 * @see #setBase_PackageImport(PackageImport)
-	 * @see C_Cpp.C_CppPackage#getInclude_Base_PackageImport()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_Base_PackageImport()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	PackageImport getBase_PackageImport();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getBase_PackageImport <em>Base Package Import</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base Package Import</em>' reference.
@@ -175,14 +175,14 @@ public interface Include extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Pre Body</em>' attribute.
 	 * @see #setPreBody(String)
-	 * @see C_Cpp.C_CppPackage#getInclude_PreBody()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_PreBody()
 	 * @model default="" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getPreBody();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Include#getPreBody <em>Pre Body</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Pre Body</em>' attribute.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Inline.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
index 702ebd0e51c..9bb30dca888 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Inline.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,11 +14,11 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Inline#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Inline#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getInline()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInline()
  * @model
  * @generated
  */
@@ -33,14 +33,14 @@ public interface Inline extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base operation</em>' reference.
 	 * @see #setBase_operation(Operation)
-	 * @see C_Cpp.C_CppPackage#getInline_Base_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInline_Base_operation()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Operation getBase_operation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Inline#getBase_operation <em>Base operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Inline#getBase_operation <em>Base operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base operation</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ManualGeneration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
index 4e0f1f23dcd..04d0a7e1e11 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/ManualGeneration.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}</li>
- *   <li>{@link C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getManualGeneration()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getManualGeneration()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface ManualGeneration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Extension Body</em>' attribute.
 	 * @see #setExtensionBody(String)
-	 * @see C_Cpp.C_CppPackage#getManualGeneration_ExtensionBody()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getManualGeneration_ExtensionBody()
 	 * @model dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getExtensionBody();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getExtensionBody <em>Extension Body</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Extension Body</em>' attribute.
@@ -62,14 +62,14 @@ public interface ManualGeneration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
-	 * @see C_Cpp.C_CppPackage#getManualGeneration_Base_Class()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getManualGeneration_Base_Class()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base Class</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/NoCodeGen.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
index 0daf478fa04..9952228fdfc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/NoCodeGen.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,11 +14,11 @@ import org.eclipse.uml2.uml.Element;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getNoCodeGen()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getNoCodeGen()
  * @model
  * @generated
  */
@@ -33,14 +33,14 @@ public interface NoCodeGen extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base element</em>' reference.
 	 * @see #setBase_element(Element)
-	 * @see C_Cpp.C_CppPackage#getNoCodeGen_Base_element()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getNoCodeGen_Base_element()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Element getBase_element();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base element</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Ptr.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
index 8fc6f5d5999..29bdf670378 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Ptr.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -19,13 +19,13 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.Ptr#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.Ptr#getDeclaration <em>Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Ptr#getDeclaration <em>Declaration</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getPtr()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getPtr()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface Ptr extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
-	 * @see C_Cpp.C_CppPackage#getPtr_Base_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getPtr_Base_parameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_parameter <em>Base parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base parameter</em>' reference.
@@ -66,14 +66,14 @@ public interface Ptr extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
-	 * @see C_Cpp.C_CppPackage#getPtr_Base_property()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getPtr_Base_property()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Ptr#getBase_property <em>Base property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Ptr#getBase_property <em>Base property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base property</em>' reference.
@@ -92,14 +92,14 @@ public interface Ptr extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Declaration</em>' attribute.
 	 * @see #setDeclaration(String)
-	 * @see C_Cpp.C_CppPackage#getPtr_Declaration()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getPtr_Declaration()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getDeclaration();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Ptr#getDeclaration <em>Declaration</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Ptr#getDeclaration <em>Declaration</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Declaration</em>' attribute.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Ref.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
index e01188a8ef1..390f3356d41 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Ref.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -15,12 +15,12 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.Ref#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_property <em>Base property</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getRef()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getRef()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface Ref extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
-	 * @see C_Cpp.C_CppPackage#getRef_Base_parameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getRef_Base_parameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_parameter <em>Base parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base parameter</em>' reference.
@@ -61,14 +61,14 @@ public interface Ref extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
-	 * @see C_Cpp.C_CppPackage#getRef_Base_property()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getRef_Base_property()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Ref#getBase_property <em>Base property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Ref#getBase_property <em>Base property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base property</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/StorageClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
index d83978460c1..610597e8425 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/StorageClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,18 +12,18 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getStorageClass()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getStorageClass()
  * @model
  * @generated
  */
 public interface StorageClass extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Storage Class</b></em>' attribute.
-	 * The literals are from the enumeration {@link C_Cpp.EStorageClass}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.C_Cpp.EStorageClass}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Storage Class</em>' attribute isn't clear,
@@ -31,20 +31,20 @@ public interface StorageClass extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Storage Class</em>' attribute.
-	 * @see C_Cpp.EStorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.EStorageClass
 	 * @see #setStorageClass(EStorageClass)
-	 * @see C_Cpp.C_CppPackage#getStorageClass_StorageClass()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getStorageClass_StorageClass()
 	 * @model unique="false" required="true" ordered="false"
 	 * @generated
 	 */
 	EStorageClass getStorageClass();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Storage Class</em>' attribute.
-	 * @see C_Cpp.EStorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.EStorageClass
 	 * @see #getStorageClass()
 	 * @generated
 	 */
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Template.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
index 525d07ddaa6..bdaae9efb97 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Template.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,12 +12,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Template#getDeclaration <em>Declaration</em>}</li>
- *   <li>{@link C_Cpp.Template#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Template#getDeclaration <em>Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Template#getBase_class <em>Base class</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getTemplate()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplate()
  * @model
  * @generated
  */
@@ -32,14 +32,14 @@ public interface Template extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Declaration</em>' attribute.
 	 * @see #setDeclaration(String)
-	 * @see C_Cpp.C_CppPackage#getTemplate_Declaration()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplate_Declaration()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getDeclaration();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Template#getDeclaration <em>Declaration</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Template#getDeclaration <em>Declaration</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Declaration</em>' attribute.
@@ -58,14 +58,14 @@ public interface Template extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base class</em>' reference.
 	 * @see #setBase_class(org.eclipse.uml2.uml.Class)
-	 * @see C_Cpp.C_CppPackage#getTemplate_Base_class()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplate_Base_class()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.Class getBase_class();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Template#getBase_class <em>Base class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Template#getBase_class <em>Base class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base class</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/TemplateBinding.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
index 1635094e526..9d0118365fd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/TemplateBinding.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,12 +12,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.TemplateBinding#getBinding <em>Binding</em>}</li>
- *   <li>{@link C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBinding <em>Binding</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getTemplateBinding()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateBinding()
  * @model
  * @generated
  */
@@ -32,14 +32,14 @@ public interface TemplateBinding extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Binding</em>' attribute.
 	 * @see #setBinding(String)
-	 * @see C_Cpp.C_CppPackage#getTemplateBinding_Binding()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateBinding_Binding()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getBinding();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.TemplateBinding#getBinding <em>Binding</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBinding <em>Binding</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Binding</em>' attribute.
@@ -58,14 +58,14 @@ public interface TemplateBinding extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base templatebinding</em>' reference.
 	 * @see #setBase_templatebinding(org.eclipse.uml2.uml.TemplateBinding)
-	 * @see C_Cpp.C_CppPackage#getTemplateBinding_Base_templatebinding()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateBinding_Base_templatebinding()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.TemplateBinding getBase_templatebinding();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding#getBase_templatebinding <em>Base templatebinding</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base templatebinding</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/TemplateParameter.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
index aa419d100e7..037b47036f8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/TemplateParameter.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -12,12 +12,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.TemplateParameter#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getTemplateParameter()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateParameter()
  * @model
  * @generated
  */
@@ -32,14 +32,14 @@ public interface TemplateParameter extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see C_Cpp.C_CppPackage#getTemplateParameter_Name()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateParameter_Name()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.TemplateParameter#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -58,14 +58,14 @@ public interface TemplateParameter extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base templateparameter</em>' reference.
 	 * @see #setBase_templateparameter(org.eclipse.uml2.uml.TemplateParameter)
-	 * @see C_Cpp.C_CppPackage#getTemplateParameter_Base_templateparameter()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTemplateParameter_Base_templateparameter()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	org.eclipse.uml2.uml.TemplateParameter getBase_templateparameter();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter#getBase_templateparameter <em>Base templateparameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base templateparameter</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Typedef.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
index d9cae48f7a3..c59acde0ef4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Typedef.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,12 +14,12 @@ import org.eclipse.uml2.uml.PrimitiveType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Typedef#getDefinition <em>Definition</em>}</li>
- *   <li>{@link C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Typedef#getDefinition <em>Definition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getTypedef()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTypedef()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface Typedef extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Definition</em>' attribute.
 	 * @see #setDefinition(String)
-	 * @see C_Cpp.C_CppPackage#getTypedef_Definition()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTypedef_Definition()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getDefinition();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Typedef#getDefinition <em>Definition</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Typedef#getDefinition <em>Definition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Definition</em>' attribute.
@@ -60,14 +60,14 @@ public interface Typedef extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base primitivetype</em>' reference.
 	 * @see #setBase_primitivetype(PrimitiveType)
-	 * @see C_Cpp.C_CppPackage#getTypedef_Base_primitivetype()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getTypedef_Base_primitivetype()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	PrimitiveType getBase_primitivetype();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Typedef#getBase_primitivetype <em>Base primitivetype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base primitivetype</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Union.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
index ed209bbc6c8..a07f313835c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Union.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,11 +14,11 @@ import org.eclipse.uml2.uml.DataType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getUnion()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getUnion()
  * @model
  * @generated
  */
@@ -33,14 +33,14 @@ public interface Union extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base Data Type</em>' reference.
 	 * @see #setBase_DataType(DataType)
-	 * @see C_Cpp.C_CppPackage#getUnion_Base_DataType()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getUnion_Base_DataType()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	DataType getBase_DataType();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Union#getBase_DataType <em>Base Data Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base Data Type</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Virtual.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
index 5839ab535d2..94df87da751 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Virtual.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,11 +14,11 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Virtual#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Virtual#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getVirtual()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVirtual()
  * @model
  * @generated
  */
@@ -33,14 +33,14 @@ public interface Virtual extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base operation</em>' reference.
 	 * @see #setBase_operation(Operation)
-	 * @see C_Cpp.C_CppPackage#getVirtual_Base_operation()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVirtual_Base_operation()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Operation getBase_operation();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Virtual#getBase_operation <em>Base operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Virtual#getBase_operation <em>Base operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base operation</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Visibility.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
index 0a589b262fb..a2fb0dd2c19 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/Visibility.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -14,12 +14,12 @@ import org.eclipse.uml2.uml.Generalization;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link C_Cpp.Visibility#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Visibility#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}</li>
  * </ul>
  * </p>
  *
- * @see C_Cpp.C_CppPackage#getVisibility()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVisibility()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface Visibility extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
-	 * @see C_Cpp.C_CppPackage#getVisibility_Value()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVisibility_Value()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Visibility#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Visibility#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
@@ -60,14 +60,14 @@ public interface Visibility extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base generalization</em>' reference.
 	 * @see #setBase_generalization(Generalization)
-	 * @see C_Cpp.C_CppPackage#getVisibility_Base_generalization()
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVisibility_Base_generalization()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
 	Generalization getBase_generalization();
 
 	/**
-	 * Sets the value of the '{@link C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Visibility#getBase_generalization <em>Base generalization</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Base generalization</em>' reference.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/VisibilityKind.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
index 6c0ba63d445..969a4647e4e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/VisibilityKind.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp;
+package org.eclipse.papyrus.C_Cpp;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Visibility Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage#getVisibilityKind()
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVisibilityKind()
  * @model
  * @generated
  */
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ArrayImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
index b7ecf9ec8ef..ca94a449db4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ArrayImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.Array;
-import C_Cpp.C_CppPackage;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.Array;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
@@ -24,10 +20,10 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ArrayImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.impl.ArrayImpl#getDefinition <em>Definition</em>}</li>
- *   <li>{@link C_Cpp.impl.ArrayImpl#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.impl.ArrayImpl#getBase_association <em>Base association</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl#getDefinition <em>Definition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl#getBase_association <em>Base association</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/C_CppFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
index 8c64c31e12e..5b4079373c8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/C_CppFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.*;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.C_Cpp.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
index 729a85fa7c9..bfe5ad3c686 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/C_CppPackageImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
@@ -1,46 +1,42 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.Array;
-import C_Cpp.C_CppFactory;
-import C_Cpp.C_CppPackage;
-import C_Cpp.Const;
-import C_Cpp.ConstInit;
-import C_Cpp.CppInit;
-import C_Cpp.CppRoot;
-import C_Cpp.Default;
-import C_Cpp.EAccessKind;
-import C_Cpp.EStorageClass;
-import C_Cpp.ExternClass;
-import C_Cpp.ExternLibrary;
-import C_Cpp.Friend;
-import C_Cpp.Include;
-import C_Cpp.Inline;
-import C_Cpp.ManualGeneration;
-import C_Cpp.NoCodeGen;
-import C_Cpp.Ptr;
-import C_Cpp.Ref;
-import C_Cpp.StorageClass;
-import C_Cpp.Template;
-import C_Cpp.TemplateBinding;
-import C_Cpp.TemplateParameter;
-import C_Cpp.Typedef;
-import C_Cpp.Union;
-import C_Cpp.Virtual;
-import C_Cpp.Visibility;
-import C_Cpp.VisibilityKind;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
+import org.eclipse.papyrus.C_Cpp.Array;
+import org.eclipse.papyrus.C_Cpp.C_CppFactory;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Const;
+import org.eclipse.papyrus.C_Cpp.ConstInit;
+import org.eclipse.papyrus.C_Cpp.CppInit;
+import org.eclipse.papyrus.C_Cpp.CppRoot;
+import org.eclipse.papyrus.C_Cpp.Default;
+import org.eclipse.papyrus.C_Cpp.EAccessKind;
+import org.eclipse.papyrus.C_Cpp.EStorageClass;
+import org.eclipse.papyrus.C_Cpp.ExternClass;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
+import org.eclipse.papyrus.C_Cpp.Friend;
+import org.eclipse.papyrus.C_Cpp.Include;
+import org.eclipse.papyrus.C_Cpp.Inline;
+import org.eclipse.papyrus.C_Cpp.ManualGeneration;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+import org.eclipse.papyrus.C_Cpp.Ptr;
+import org.eclipse.papyrus.C_Cpp.Ref;
+import org.eclipse.papyrus.C_Cpp.StorageClass;
+import org.eclipse.papyrus.C_Cpp.Template;
+import org.eclipse.papyrus.C_Cpp.TemplateBinding;
+import org.eclipse.papyrus.C_Cpp.TemplateParameter;
+import org.eclipse.papyrus.C_Cpp.Typedef;
+import org.eclipse.papyrus.C_Cpp.Union;
+import org.eclipse.papyrus.C_Cpp.Virtual;
+import org.eclipse.papyrus.C_Cpp.Visibility;
+import org.eclipse.papyrus.C_Cpp.VisibilityKind;
 import org.eclipse.uml2.types.TypesPackage;
-
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
@@ -243,7 +239,7 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see C_Cpp.C_CppPackage#eNS_URI
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ConstImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
index 1298ef72ed9..76b3021c84e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ConstImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Const;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Const;
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
@@ -24,9 +20,9 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ConstImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.impl.ConstImpl#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.impl.ConstImpl#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ConstInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
index 6eb05e10363..0f1796d5091 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ConstInitImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.ConstInit;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.ConstInit;
 import org.eclipse.uml2.uml.Operation;
 
 /**
@@ -22,8 +18,8 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ConstInitImpl#getInitialisation <em>Initialisation</em>}</li>
- *   <li>{@link C_Cpp.impl.ConstInitImpl#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl#getInitialisation <em>Initialisation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/CppInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
index 67772cbff3e..cabb69ddc89 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/CppInitImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.CppInit;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.CppInit;
 import org.eclipse.uml2.uml.EnumerationLiteral;
 
 /**
@@ -22,8 +18,8 @@ import org.eclipse.uml2.uml.EnumerationLiteral;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.CppInitImpl#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.impl.CppInitImpl#getBase_enumerationliteral <em>Base enumerationliteral</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.CppInitImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.CppInitImpl#getBase_enumerationliteral <em>Base enumerationliteral</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/CppRootImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
index 1f66a27c988..3c3b816b575 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/CppRootImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.CppRoot;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.CppRoot;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.CppRootImpl#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl#getBase_package <em>Base package</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/DefaultImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/DefaultImpl.java
index 818aa533d45..c0638b6db84 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/DefaultImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/DefaultImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Default;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Default;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
@@ -23,9 +19,9 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.DefaultImpl#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.impl.DefaultImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.impl.DefaultImpl#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getBase_property <em>Base property</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ExternClassImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternClassImpl.java
index 2a6bdb61daa..b5da615be30 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ExternClassImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternClassImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.ExternClass;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.ExternClass;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ExternClassImpl#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.impl.ExternClassImpl#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ExternClassImpl#getBase_class <em>Base class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ExternLibraryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
index 696cb43a2ac..28aa1c0d223 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ExternLibraryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.ExternLibrary;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ExternLibraryImpl#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.impl.ExternLibraryImpl#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl#getBase_package <em>Base package</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/FriendImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
index 02850f4fbb6..9a862cb5536 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/FriendImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Friend;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Friend;
 import org.eclipse.uml2.uml.Dependency;
 import org.eclipse.uml2.uml.Operation;
 
@@ -23,8 +19,8 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.FriendImpl#getBase_dependency <em>Base dependency</em>}</li>
- *   <li>{@link C_Cpp.impl.FriendImpl#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.FriendImpl#getBase_dependency <em>Base dependency</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.FriendImpl#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/IncludeImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
index 0226dc2263a..db52dbfcf77 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/IncludeImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Include;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Include;
 import org.eclipse.uml2.uml.PackageImport;
 
 /**
@@ -22,12 +18,12 @@ import org.eclipse.uml2.uml.PackageImport;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getBody <em>Body</em>}</li>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getPreBody <em>Pre Body</em>}</li>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getHeader <em>Header</em>}</li>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getBase_package <em>Base package</em>}</li>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getBase_class <em>Base class</em>}</li>
- *   <li>{@link C_Cpp.impl.IncludeImpl#getBase_PackageImport <em>Base Package Import</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getPreBody <em>Pre Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getHeader <em>Header</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getBase_package <em>Base package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl#getBase_PackageImport <em>Base Package Import</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/InlineImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
index ade9ba81a70..ef591a3702f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/InlineImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Inline;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Inline;
 import org.eclipse.uml2.uml.Operation;
 
 /**
@@ -22,7 +18,7 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.InlineImpl#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.InlineImpl#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ManualGenerationImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
index 947dd42261e..f4230a8f78e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/ManualGenerationImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.ManualGeneration;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.ManualGeneration;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.ManualGenerationImpl#getExtensionBody <em>Extension Body</em>}</li>
- *   <li>{@link C_Cpp.impl.ManualGenerationImpl#getBase_Class <em>Base Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl#getExtensionBody <em>Extension Body</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/NoCodeGenImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
index 8c35decb9db..7a1c06b1396 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/NoCodeGenImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.NoCodeGen;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.NoCodeGen;
 import org.eclipse.uml2.uml.Element;
 
 /**
@@ -22,7 +18,7 @@ import org.eclipse.uml2.uml.Element;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.NoCodeGenImpl#getBase_element <em>Base element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl#getBase_element <em>Base element</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/PtrImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
index 824b7610ac2..7cd65b340c1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/PtrImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Ptr;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Ptr;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
@@ -23,9 +19,9 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.PtrImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.impl.PtrImpl#getBase_property <em>Base property</em>}</li>
- *   <li>{@link C_Cpp.impl.PtrImpl#getDeclaration <em>Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.PtrImpl#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.PtrImpl#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.PtrImpl#getDeclaration <em>Declaration</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/RefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
index 87d7188410f..74662cf3f81 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/RefImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Ref;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Ref;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
@@ -23,8 +19,8 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.RefImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link C_Cpp.impl.RefImpl#getBase_property <em>Base property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl#getBase_parameter <em>Base parameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl#getBase_property <em>Base property</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/StorageClassImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
index f746cff7bb2..2c05f5a729c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/StorageClassImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.EStorageClass;
-import C_Cpp.StorageClass;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.EStorageClass;
+import org.eclipse.papyrus.C_Cpp.StorageClass;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.StorageClassImpl#getStorageClass <em>Storage Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl#getStorageClass <em>Storage Class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateBindingImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
index bfb55575fd5..f2a0bfb4483 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateBindingImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.TemplateBinding;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.TemplateBinding;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.TemplateBindingImpl#getBinding <em>Binding</em>}</li>
- *   <li>{@link C_Cpp.impl.TemplateBindingImpl#getBase_templatebinding <em>Base templatebinding</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl#getBinding <em>Binding</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl#getBase_templatebinding <em>Base templatebinding</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
index c543f1dc500..b6d37f0e520 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Template;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Template;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.TemplateImpl#getDeclaration <em>Declaration</em>}</li>
- *   <li>{@link C_Cpp.impl.TemplateImpl#getBase_class <em>Base class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateImpl#getDeclaration <em>Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateImpl#getBase_class <em>Base class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateParameterImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
index 552a9c2ea18..c1beec5e5b0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TemplateParameterImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
@@ -1,17 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.TemplateParameter;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.TemplateParameter;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,8 +17,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.TemplateParameterImpl#getName <em>Name</em>}</li>
- *   <li>{@link C_Cpp.impl.TemplateParameterImpl#getBase_templateparameter <em>Base templateparameter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl#getBase_templateparameter <em>Base templateparameter</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TypedefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
index dff64acf709..88e2c2dd22f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/TypedefImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Typedef;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Typedef;
 import org.eclipse.uml2.uml.PrimitiveType;
 
 /**
@@ -22,8 +18,8 @@ import org.eclipse.uml2.uml.PrimitiveType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.TypedefImpl#getDefinition <em>Definition</em>}</li>
- *   <li>{@link C_Cpp.impl.TypedefImpl#getBase_primitivetype <em>Base primitivetype</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TypedefImpl#getDefinition <em>Definition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.TypedefImpl#getBase_primitivetype <em>Base primitivetype</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/UnionImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
index 6d9d2aa79e7..01c35e72f2c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/UnionImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Union;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Union;
 import org.eclipse.uml2.uml.DataType;
 
 /**
@@ -22,7 +18,7 @@ import org.eclipse.uml2.uml.DataType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.UnionImpl#getBase_DataType <em>Base Data Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.UnionImpl#getBase_DataType <em>Base Data Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/VirtualImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
index f5f21b9227c..011107fc7fb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/VirtualImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Virtual;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Virtual;
 import org.eclipse.uml2.uml.Operation;
 
 /**
@@ -22,7 +18,7 @@ import org.eclipse.uml2.uml.Operation;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.VirtualImpl#getBase_operation <em>Base operation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.VirtualImpl#getBase_operation <em>Base operation</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/VisibilityImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
index a6464a38041..8c34f91ab53 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/impl/VisibilityImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
@@ -1,18 +1,14 @@
 /**
  */
-package C_Cpp.impl;
-
-import C_Cpp.C_CppPackage;
-import C_Cpp.Visibility;
+package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Visibility;
 import org.eclipse.uml2.uml.Generalization;
 
 /**
@@ -22,8 +18,8 @@ import org.eclipse.uml2.uml.Generalization;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link C_Cpp.impl.VisibilityImpl#getValue <em>Value</em>}</li>
- *   <li>{@link C_Cpp.impl.VisibilityImpl#getBase_generalization <em>Base generalization</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl#getBase_generalization <em>Base generalization</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppAdapterFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
index 40564de741c..c147fe6d15d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppAdapterFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
@@ -1,22 +1,19 @@
 /**
  */
-package C_Cpp.util;
-
-import C_Cpp.*;
+package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.C_Cpp.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage
  * @generated
  */
 public class C_CppAdapterFactory extends AdapterFactoryImpl {
@@ -180,13 +177,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Ptr <em>Ptr</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Ptr <em>Ptr</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Ptr
+	 * @see org.eclipse.papyrus.C_Cpp.Ptr
 	 * @generated
 	 */
 	public Adapter createPtrAdapter() {
@@ -194,13 +191,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Include <em>Include</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Include <em>Include</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Include
+	 * @see org.eclipse.papyrus.C_Cpp.Include
 	 * @generated
 	 */
 	public Adapter createIncludeAdapter() {
@@ -208,13 +205,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.ManualGeneration <em>Manual Generation</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration <em>Manual Generation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.ManualGeneration
+	 * @see org.eclipse.papyrus.C_Cpp.ManualGeneration
 	 * @generated
 	 */
 	public Adapter createManualGenerationAdapter() {
@@ -222,13 +219,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Array <em>Array</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Array <em>Array</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Array
+	 * @see org.eclipse.papyrus.C_Cpp.Array
 	 * @generated
 	 */
 	public Adapter createArrayAdapter() {
@@ -236,13 +233,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Const <em>Const</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Const <em>Const</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Const
+	 * @see org.eclipse.papyrus.C_Cpp.Const
 	 * @generated
 	 */
 	public Adapter createConstAdapter() {
@@ -250,13 +247,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Default <em>Default</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Default <em>Default</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Default
+	 * @see org.eclipse.papyrus.C_Cpp.Default
 	 * @generated
 	 */
 	public Adapter createDefaultAdapter() {
@@ -264,13 +261,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Ref <em>Ref</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Ref
+	 * @see org.eclipse.papyrus.C_Cpp.Ref
 	 * @generated
 	 */
 	public Adapter createRefAdapter() {
@@ -278,13 +275,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.ExternClass <em>Extern Class</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ExternClass <em>Extern Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.ExternClass
+	 * @see org.eclipse.papyrus.C_Cpp.ExternClass
 	 * @generated
 	 */
 	public Adapter createExternClassAdapter() {
@@ -292,13 +289,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.ExternLibrary <em>Extern Library</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.ExternLibrary
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
 	 * @generated
 	 */
 	public Adapter createExternLibraryAdapter() {
@@ -306,13 +303,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.CppRoot <em>Cpp Root</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.CppRoot
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
 	 * @generated
 	 */
 	public Adapter createCppRootAdapter() {
@@ -320,13 +317,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.NoCodeGen
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
 	 * @generated
 	 */
 	public Adapter createNoCodeGenAdapter() {
@@ -334,13 +331,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.ConstInit <em>Const Init</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ConstInit <em>Const Init</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.ConstInit
+	 * @see org.eclipse.papyrus.C_Cpp.ConstInit
 	 * @generated
 	 */
 	public Adapter createConstInitAdapter() {
@@ -348,13 +345,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Friend <em>Friend</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Friend <em>Friend</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Friend
+	 * @see org.eclipse.papyrus.C_Cpp.Friend
 	 * @generated
 	 */
 	public Adapter createFriendAdapter() {
@@ -362,13 +359,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Inline <em>Inline</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Inline <em>Inline</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Inline
+	 * @see org.eclipse.papyrus.C_Cpp.Inline
 	 * @generated
 	 */
 	public Adapter createInlineAdapter() {
@@ -376,13 +373,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Virtual <em>Virtual</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Virtual <em>Virtual</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Virtual
+	 * @see org.eclipse.papyrus.C_Cpp.Virtual
 	 * @generated
 	 */
 	public Adapter createVirtualAdapter() {
@@ -390,13 +387,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Typedef <em>Typedef</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Typedef <em>Typedef</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Typedef
+	 * @see org.eclipse.papyrus.C_Cpp.Typedef
 	 * @generated
 	 */
 	public Adapter createTypedefAdapter() {
@@ -404,13 +401,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Visibility <em>Visibility</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Visibility <em>Visibility</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Visibility
+	 * @see org.eclipse.papyrus.C_Cpp.Visibility
 	 * @generated
 	 */
 	public Adapter createVisibilityAdapter() {
@@ -418,13 +415,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.CppInit <em>Cpp Init</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.CppInit <em>Cpp Init</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.CppInit
+	 * @see org.eclipse.papyrus.C_Cpp.CppInit
 	 * @generated
 	 */
 	public Adapter createCppInitAdapter() {
@@ -432,13 +429,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Template <em>Template</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Template <em>Template</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Template
+	 * @see org.eclipse.papyrus.C_Cpp.Template
 	 * @generated
 	 */
 	public Adapter createTemplateAdapter() {
@@ -446,13 +443,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.TemplateBinding <em>Template Binding</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.TemplateBinding <em>Template Binding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.TemplateBinding
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateBinding
 	 * @generated
 	 */
 	public Adapter createTemplateBindingAdapter() {
@@ -460,13 +457,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.TemplateParameter <em>Template Parameter</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.TemplateParameter <em>Template Parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.TemplateParameter
+	 * @see org.eclipse.papyrus.C_Cpp.TemplateParameter
 	 * @generated
 	 */
 	public Adapter createTemplateParameterAdapter() {
@@ -474,13 +471,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.Union <em>Union</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Union <em>Union</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.Union
+	 * @see org.eclipse.papyrus.C_Cpp.Union
 	 * @generated
 	 */
 	public Adapter createUnionAdapter() {
@@ -488,13 +485,13 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link C_Cpp.StorageClass <em>Storage Class</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.StorageClass <em>Storage Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see C_Cpp.StorageClass
+	 * @see org.eclipse.papyrus.C_Cpp.StorageClass
 	 * @generated
 	 */
 	public Adapter createStorageClassAdapter() {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppResourceFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
index 9aa34663e7f..605b375a1e2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppResourceFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp.util;
+package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see C_Cpp.util.C_CppResourceImpl
+ * @see org.eclipse.papyrus.C_Cpp.util.C_CppResourceImpl
  * @generated
  */
 public class C_CppResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppResourceImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
index c5ff41f8340..f16bfcc7def 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppResourceImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
@@ -1,6 +1,6 @@
 /**
  */
-package C_Cpp.util;
+package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see C_Cpp.util.C_CppResourceFactoryImpl
+ * @see org.eclipse.papyrus.C_Cpp.util.C_CppResourceFactoryImpl
  * @generated
  */
 public class C_CppResourceImpl extends XMLResourceImpl {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppSwitch.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
index 6c59b8db5a8..bb20a38c71c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppSwitch.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
@@ -1,13 +1,11 @@
 /**
  */
-package C_Cpp.util;
-
-import C_Cpp.*;
+package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.C_Cpp.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -19,7 +17,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see C_Cpp.C_CppPackage
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage
  * @generated
  */
 public class C_CppSwitch<T> extends Switch<T> {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppXMLProcessor.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
index afa1745c295..b97a9a3cb16 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/C_Cpp/util/C_CppXMLProcessor.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
@@ -1,16 +1,13 @@
 /**
  */
-package C_Cpp.util;
-
-import C_Cpp.C_CppPackage;
+package org.eclipse.papyrus.C_Cpp.util;
 
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
index 4a0eb9a98ea..8ba7a277c44 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppClassPanel.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.views.panels;
 

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.source.SourceViewer;

+import org.eclipse.papyrus.C_Cpp.Include;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.widgets.Composite;

@@ -21,8 +22,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Element;

 

-import C_Cpp.Include;

-

 

 

 /**

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
index 131463a2162..9a7cb1a9133 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppGeneralizationPanel.java
@@ -11,6 +11,7 @@
 

 package org.eclipse.papyrus.views.panels;

 

+import org.eclipse.papyrus.C_Cpp.Visibility;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.Activator;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

@@ -26,8 +27,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Generalization;

 

-import C_Cpp.Visibility;

-

 

 

 /**

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
index e5bfb3fef09..b14a0fe17c6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppOperationPanel.java
@@ -14,6 +14,11 @@ package org.eclipse.papyrus.views.panels;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.source.ISourceViewer;

+import org.eclipse.papyrus.C_Cpp.Const;

+import org.eclipse.papyrus.C_Cpp.ConstInit;

+import org.eclipse.papyrus.C_Cpp.Friend;

+import org.eclipse.papyrus.C_Cpp.Inline;

+import org.eclipse.papyrus.C_Cpp.Virtual;

 import org.eclipse.papyrus.acceleo.AcceleoDriver;

 import org.eclipse.papyrus.acceleo.AcceleoException;

 import org.eclipse.papyrus.cpp.profile.StUtils;

@@ -38,12 +43,6 @@ import org.eclipse.uml2.uml.OpaqueBehavior;
 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLPackage;

 

-import C_Cpp.Const;

-import C_Cpp.ConstInit;

-import C_Cpp.Friend;

-import C_Cpp.Inline;

-import C_Cpp.Virtual;

-

 

 /**

  * Panel displayed when an Operation is selected

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
index cc0cb8fa991..b0bd5886d13 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPackagePanel.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.views.panels;

 

 import org.eclipse.jface.text.IDocument;

+import org.eclipse.papyrus.C_Cpp.Include;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.widgets.Composite;

@@ -20,8 +21,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Package;

 

-import C_Cpp.Include;

-

 

 /**

  * Panel displayed when a Package is selected

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
index 1572a51a238..8accc2cc415 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppParameterPanel.java
@@ -13,6 +13,10 @@ package org.eclipse.papyrus.views.panels;
 

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.source.SourceViewer;

+import org.eclipse.papyrus.C_Cpp.Array;

+import org.eclipse.papyrus.C_Cpp.Const;

+import org.eclipse.papyrus.C_Cpp.Ptr;

+import org.eclipse.papyrus.C_Cpp.Ref;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.widgets.Button;

@@ -22,11 +26,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Parameter;

 

-import C_Cpp.Array;

-import C_Cpp.Const;

-import C_Cpp.Ptr;

-import C_Cpp.Ref;

-

 

 /**

  * Panel displayed when a Parameter is selected

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
index 8dfb3f7ec8f..51c3795622f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPrimitiveTypePanel.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.views.panels;
 

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.source.SourceViewer;

+import org.eclipse.papyrus.C_Cpp.Typedef;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.widgets.Composite;

@@ -21,8 +22,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.PrimitiveType;

 

-import C_Cpp.Typedef;

-

 

 /**

  * Panel displayed when a PrimitiveType is selected

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
index 85caf6eb98b..84495ee1c30 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppPropertyPanel.java
@@ -12,6 +12,10 @@ package org.eclipse.papyrus.views.panels;
 

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.source.SourceViewer;

+import org.eclipse.papyrus.C_Cpp.Array;

+import org.eclipse.papyrus.C_Cpp.Const;

+import org.eclipse.papyrus.C_Cpp.Ptr;

+import org.eclipse.papyrus.C_Cpp.Ref;

 import org.eclipse.papyrus.cpp.profile.StUtils;

 import org.eclipse.papyrus.views.cpp.CommandSupport;

 import org.eclipse.swt.events.SelectionEvent;

@@ -23,11 +27,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Property;

 

-import C_Cpp.Array;

-import C_Cpp.Const;

-import C_Cpp.Ptr;

-import C_Cpp.Ref;

-

 

 /**

  * Panel displayed when a Property is selected

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
index a435d1f19dd..b075257945c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateBindingPanel.java
@@ -119,7 +119,7 @@ public class CppTemplateBindingPanel extends CppAbstractPanel {
 					if(newB.equals("")) {

 						StUtils.unapply(selectedTB, TemplateBinding.class);

 					} else {

-						C_Cpp.TemplateBinding templateBinding = StUtils.applyApp(selectedTB, C_Cpp.TemplateBinding.class);

+						org.eclipse.papyrus.C_Cpp.TemplateBinding templateBinding = StUtils.applyApp(selectedTB, org.eclipse.papyrus.C_Cpp.TemplateBinding.class);

 						// TODO: use UML template bindings?

 						templateBinding.setBinding(newB);

 					}

@@ -136,7 +136,7 @@ public class CppTemplateBindingPanel extends CppAbstractPanel {
 	@Override

 	protected void refreshPanel() {

 		if(selectedTB != null) {

-			C_Cpp.TemplateBinding templateBinding = StUtils.getApplication(selectedTB, C_Cpp.TemplateBinding.class);

+			org.eclipse.papyrus.C_Cpp.TemplateBinding templateBinding = StUtils.getApplication(selectedTB, org.eclipse.papyrus.C_Cpp.TemplateBinding.class);

 			// TODO: use UML template bindings?

 			docBinding.set(templateBinding != null ? templateBinding.getBinding() : "");

 		}

@@ -160,7 +160,7 @@ public class CppTemplateBindingPanel extends CppAbstractPanel {
 	 */

 	@Override

 	public boolean checkModifications() {

-		C_Cpp.TemplateBinding templateBinding = StUtils.getApplication(selectedTB, C_Cpp.TemplateBinding.class);

+		org.eclipse.papyrus.C_Cpp.TemplateBinding templateBinding = StUtils.getApplication(selectedTB, org.eclipse.papyrus.C_Cpp.TemplateBinding.class);

 		// TODO: use UML template bindings?

 		String bindingValue = templateBinding != null ? templateBinding.getBinding() : "";

 		if(!docBinding.get().equals(bindingValue)) {

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
index e342a3b276f..c413d9a3163 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppTemplateParameterPanel.java
@@ -118,10 +118,10 @@ public class CppTemplateParameterPanel extends CppAbstractPanel {
 					// Treat Parameter name

 					String newB = docParameter.get();

 					if(newB.equals("")) {

-						StUtils.unapply(selectedTP, C_Cpp.TemplateParameter.class);

+						StUtils.unapply(selectedTP, org.eclipse.papyrus.C_Cpp.TemplateParameter.class);

 					}

 					else {

-						C_Cpp.TemplateParameter templateParameter = StUtils.applyApp(selectedTP, C_Cpp.TemplateParameter.class);

+						org.eclipse.papyrus.C_Cpp.TemplateParameter templateParameter = StUtils.applyApp(selectedTP, org.eclipse.papyrus.C_Cpp.TemplateParameter.class);

 						templateParameter.setName(newB);

 					}

 				}

@@ -140,7 +140,7 @@ public class CppTemplateParameterPanel extends CppAbstractPanel {
 			/* Log.debug("resetBody : selectedProperty is null"); */

 		} else {

 

-			C_Cpp.TemplateParameter templateParameter = StUtils.getApplication(selectedTP, C_Cpp.TemplateParameter.class);

+			org.eclipse.papyrus.C_Cpp.TemplateParameter templateParameter = StUtils.getApplication(selectedTP, org.eclipse.papyrus.C_Cpp.TemplateParameter.class);

 			String parameterName = templateParameter != null ? templateParameter.getName() : "";

 			docParameter.set(parameterName);

 		}

@@ -163,7 +163,7 @@ public class CppTemplateParameterPanel extends CppAbstractPanel {
 	 */

 	@Override

 	public boolean checkModifications() {

-		C_Cpp.TemplateParameter templateParameter = StUtils.getApplication(selectedTP, C_Cpp.TemplateParameter.class);

+		org.eclipse.papyrus.C_Cpp.TemplateParameter templateParameter = StUtils.getApplication(selectedTP, org.eclipse.papyrus.C_Cpp.TemplateParameter.class);

 		// TODO: use UML template bindings?

 		String parameterName = templateParameter != null ? templateParameter.getName() : "";

 		if(!docParameter.get().equals(parameterName)) {