diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
index 6c5c241b133af0a1cf165625dda1742763a9d60e..453af80511b83420d9be7a2d8688e3baa2879048 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
@@ -98,13 +98,12 @@ public abstract class Renderer {
 			if (mapping != null)
 				return mapping.getElementURI();
 
-		} else {
-			String name = this.elementNames.get(e);
-			if (name != null)
-				return name;
 		}
+		String name = this.elementNames.get(e);
+		if (name != null)
+			return name;
 
-		String name = e.getName();
+		name = e.getName();
 		if (name == null)
 			name = e.eClass().getName();
 		String identifier = getIdentifier(name);