diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
index fe3679c6c12d4affb3f6993301f6e5b8eb64b0cc..59ff42a7d8e3e891c5c5e85602bfc946d93f961c 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
@@ -1,4 +1,3 @@
-AF3DeployableComponentAdapter.java 7928e43de3a336a64c7e36cc43c209ea5b65f93d RED
 AF3ExecutionUnitAdapter.java bc68d73a77512eb6695b663f3e84c24696df447e RED
 AF3GatewayAdapter.java f61ab5ff2fa58f561ea6720ba1add06c0d1f437e RED
 AF3LogicalArchitectureAdapter.java b129b15fefcd1864df1d2584f2ca0820ef6600c4 RED
@@ -9,5 +8,6 @@ AF3RequestAdapter.java 8b551cf83401d93705d0527184a961ea8244daa3 RED
 AF3ResourceAdapter.java f20b7da41445acadc3d3cc5b662a993ecbaed47a RED
 AF3ResourceConnectionAdapter.java b0804eb7d4a2b36065d45bfd90ad548ca7e6c0f8 RED
 AF3SignalAdapter.java cd04646323507aff4f3085a9275baf8a72888d18 RED
-AF3SystemModelAdapter.java 333a798e917e6ced6d452856bdb062a882b322d0 RED
+AF3SystemModelAdapter.java f42cc9d650d51283a537d28da05ec85762608931 RED
+AF3TaskAdapter.java a696f76d2ef31f3ae15f013067be9f667f7e6a0d RED
 AF3TransmissionUnitAdapter.java 9221b239d1d54cc0b2f01b3c385faa660ed1d3e0 RED
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
index 34b753576212307e7f8e61445bdbd1727bb8bcb1..30501e4e2db880dbbbd4b38e9adf82b7f30c2309 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
@@ -235,7 +235,7 @@ public class AF3SystemModelAdapter extends
 
 		for(Component curComponent : replacementComponents.keySet()) {
 			for(Component curReplacementComponent : replacementComponents.get(curComponent)) {
-				rval.put(curComponent, new AF3DeployableComponentAdapter(curReplacementComponent,
+				rval.put(curComponent, new AF3TaskAdapter(curReplacementComponent,
 						internalParameterMap));
 			}
 		}
@@ -272,7 +272,7 @@ public class AF3SystemModelAdapter extends
 						currentComponent + " have not been defined properly.");
 			}
 
-			rval.add(new AF3DeployableComponentAdapter(currentComponent, internalParameterMap,
+			rval.add(new AF3TaskAdapter(currentComponent, internalParameterMap,
 					replicationBounds.getFirst(), replicationBounds.getSecond(), period,
 					componentReplacementAdapters.get(currentComponent)));
 		}
diff --git a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3DeployableComponentAdapter.java b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3TaskAdapter.java
similarity index 93%
rename from org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3DeployableComponentAdapter.java
rename to org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3TaskAdapter.java
index cf32ff5348541eea2c64e864fc28e71e29657625..6ec5dd10c1d7baae52bf7d75c0c421a333e19534 100644
--- a/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3DeployableComponentAdapter.java
+++ b/org.fortiss.af3.exploration.alg/trunk/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3TaskAdapter.java
@@ -33,7 +33,7 @@ import org.fortiss.af3.safety.model.annotation.SafetyIntegrityLevel;
  * 
  * @author barner
  */
-public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
+public class AF3TaskAdapter extends AF3RequestAdapter<Component>
 		implements ITaskAdapter<Component> {
 	/** Map of possible Wcets defined by the deployment target. */
 	@SuppressWarnings("unused")
@@ -68,7 +68,7 @@ public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
 	 * 
 	 * @throws Exception
 	 */
-	public AF3DeployableComponentAdapter(Component deployableComponent,
+	public AF3TaskAdapter(Component deployableComponent,
 			Map<Component, InternalComponentParameters> internalParameters) throws Exception {
 		super(deployableComponent);
 
@@ -92,7 +92,7 @@ public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
 	 * 
 	 * @throws Exception
 	 */
-	public AF3DeployableComponentAdapter(Component deployableComponent,
+	public AF3TaskAdapter(Component deployableComponent,
 			Map<Component, InternalComponentParameters> internalParameters, Integer minReplication,
 			Integer maxReplication, Double period) throws Exception {
 		this(deployableComponent, internalParameters);
@@ -108,7 +108,7 @@ public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
 	 * 
 	 * @throws Exception
 	 */
-	public AF3DeployableComponentAdapter(Component deployableComponent,
+	public AF3TaskAdapter(Component deployableComponent,
 			Map<Component, InternalComponentParameters> internalParameters, Integer minReplication,
 			Integer maxReplication, Double period,
 			Collection<ITaskAdapter<Component>> componentReplacementAdapters)
@@ -123,7 +123,7 @@ public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
 	 * Creates an "concrete" {@link ITaskAdapter} for an {@link Component} with the
 	 * given period.
 	 */
-	public AF3DeployableComponentAdapter(Component deployableComponent,
+	public AF3TaskAdapter(Component deployableComponent,
 			Map<Component, InternalComponentParameters> internalParameters,
 			ITaskAdapter<Component> replacedComponent) throws Exception {
 		this(deployableComponent, internalParameters, replacedComponent.getMinReplication(),
@@ -228,9 +228,9 @@ public class AF3DeployableComponentAdapter extends AF3RequestAdapter<Component>
 
 	/** {@inheritDoc} */
 	@Override
-	public AF3DeployableComponentAdapter clone() {
+	public AF3TaskAdapter clone() {
 		try {
-			return (AF3DeployableComponentAdapter)super.clone();
+			return (AF3TaskAdapter)super.clone();
 		} catch(CloneNotSupportedException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();