diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
index 5968066c955260544a7d3142d14d9c9b9d503153..7861aa3d0023f702146246b8afc6ad23e1f5327a 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
@@ -325,7 +325,7 @@ public class HttpSystemAdapter implements SystemAdapter {
 					Data<Type, Value> pData = data.getValue().getParameter(pName);
 					if (pData != null) {
 						Object pObj = getMappedObject(pData);
-						Field pField = cl.getDeclaredField(m.getParameter(pName).getUri());
+						Field pField = cl.getDeclaredField(m.getParameterMapping(pName).getUri());
 						pField.set(obj, pObj);
 					}
 				}
diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/MappingImpl.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/MappingImpl.java
index f675b39494c2dfdc590086dc3b579851e2f9ba81..160c71e5ca54a0e5bdcc5295417335ee9bb4a9b9 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/MappingImpl.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/MappingImpl.java
@@ -70,7 +70,7 @@ public class MappingImpl extends ElementImpl implements Mapping, TriImpl<Mapping
 	}
 
 	@Override
-	public MappingImpl getParameter(String name) {
+	public MappingImpl getParameterMapping(String name) {
 		return this.parameters.get(name);
 	}
 
diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/TypeImpl.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/TypeImpl.java
index 9628d5676783e3795852acc83b85830d65232dbc..654bbb3b9522332617101a13801c0d53a732bb73 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/TypeImpl.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/TypeImpl.java
@@ -69,7 +69,7 @@ public class TypeImpl extends NamedElementImpl implements Type, TriImpl<TypeImpl
 	}
 
 	@Override
-	public TypeImpl getParameter(String name) {
+	public TypeImpl getParameterType(String name) {
 		return this.parameters.get(name);
 	}
 
diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Mapping.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Mapping.java
index 9ae6c7266e088d74e147c03b7d9cd917f64a8422..eef56892106ffe17975068980e830c83f1450421 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Mapping.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Mapping.java
@@ -54,6 +54,6 @@ public interface Mapping extends Element {
 	 * @return A <code>Mapping</code> representing a <i>ParameterMapping</i>
 	 *         element.
 	 */
-	Mapping getParameter(String parameterName);
+	Mapping getParameterMapping(String parameterName);
 
 }
diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Type.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Type.java
index 46206ccd9f0cda8c90a10768413529f35b8d138b..334ac9d7c117a8b51abdaf0cf84e5c5d1d4201a5 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Type.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/tri/Type.java
@@ -59,7 +59,7 @@ public interface Type extends NamedElement {
 	 *         <i>DataType</i> of the <i>Member</i> element corresponding to the
 	 *         parameter.
 	 */
-	Type getParameter(String parameterName);
+	Type getParameterType(String parameterName);
 
 	/**
 	 * Get the type of items of this collection type.