diff --git a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
index db78552..3ca970b 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore; singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.7.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.codegen.ecore.CodeGenEcorePlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
index 33e87b5..a1d1121 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
+++ b/plugins/org.eclipse.uml2.codegen.ecore/src/org/eclipse/uml2/codegen/ecore/templates/model/Class.java
@@ -2374,7 +2374,7 @@
   protected final String TEXT_2355 = NL + "\t\t\t\treturn isSet";
   protected final String TEXT_2356 = "();";
   protected final String TEXT_2357 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_2358 = "_ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
+  protected final String TEXT_2358 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";
   protected final String TEXT_2359 = NL + "\t\t\t\treturn !((";
   protected final String TEXT_2360 = ".Internal.Wrapper)";
   protected final String TEXT_2361 = "()).featureMap().isEmpty();";
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc b/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc
index e3bedc2..c10b560 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc
+++ b/plugins/org.eclipse.uml2.codegen.ecore/templates/model/Class/eIsSet.override.javajetinc
@@ -26,7 +26,7 @@
       <%if (genFeature.isUnsettable()) {%>
 				return isSet<%=genFeature.getAccessorName()%>();
       <%} else {%>
-				return <%=genFeature.getUpperName()%>_ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
+				return <%=genFeature.getUpperName()%>__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
       <%}%>
     <%} else if (genFeature.isListType() && !genFeature.isUnsettable()) {%>
       <%if (genFeature.isWrappedFeatureMapType()) {%>