diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
index 3c7404b5b331bf5a844274f85fea5da7b63ee626..5a56ea1afaecd7b510436c57acf4064d77b0abbd 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
@@ -34,8 +34,8 @@ EndFlowElement:
 UserTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "UserTask" 
 	('with' 'hardcoded' 'inputs' ASSOCIATION LIST_OPEN (hardcodedInputs+=VariableDeclaration (SEPARATOR hardcodedInputs+=VariableDeclaration)*)? LIST_CLOSED)?
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
@@ -43,8 +43,8 @@ UserTaskFlowElement:
 ManualTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "ManualTask" 
 	('with' 'hardcoded' 'inputs' ASSOCIATION LIST_OPEN (hardcodedInputs+=VariableDeclaration (SEPARATOR hardcodedInputs+=VariableDeclaration)*)? LIST_CLOSED)?
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
@@ -52,8 +52,8 @@ ManualTaskFlowElement:
 ScriptTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "ScriptTask" 
 	('with' 'hardcoded' 'inputs' ASSOCIATION LIST_OPEN (hardcodedInputs+=VariableDeclaration (SEPARATOR hardcodedInputs+=VariableDeclaration)*)? LIST_CLOSED)?
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
@@ -64,8 +64,8 @@ ServiceTaskFlowElement:
 DelegateServiceTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "ServiceTask" 
 	'with' 'delegate' ASSOCIATION delegate=STRING
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
@@ -74,8 +74,8 @@ ExternalServiceTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "ServiceTask" 
 	'with' 'external' ASSOCIATION externalTopic=ExternalTopicReference
 	('with' 'hardcoded' 'inputs' ASSOCIATION LIST_OPEN (hardcodedInputs+=VariableDeclaration (SEPARATOR hardcodedInputs+=VariableDeclaration)*)? LIST_CLOSED)?
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
@@ -83,8 +83,8 @@ ExternalServiceTaskFlowElement:
 BusinessRuleTaskFlowElement:
 	"FlowElement" name=ID ASSOCIATION "BusinessRuleTask" ('with' 'resultVariable' ASSOCIATION resultVariable=STRING)? 
 	('with' 'hardcoded' 'inputs' ASSOCIATION LIST_OPEN (hardcodedInputs+=VariableDeclaration (SEPARATOR hardcodedInputs+=VariableDeclaration)*)? LIST_CLOSED)?
-	('with' 'readVariables' ASSOCIATION LIST_OPEN (inputVariables+=VariableReference (SEPARATOR inputVariables+=VariableReference)*)? LIST_CLOSED)? 
-	('with' 'writeVariables' ASSOCIATION LIST_OPEN (outputVariables+=VariableReference (SEPARATOR outputVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'readVariables' ASSOCIATION LIST_OPEN (readVariables+=VariableReference (SEPARATOR readVariables+=VariableReference)*)? LIST_CLOSED)? 
+	('with' 'writeVariables' ASSOCIATION LIST_OPEN (writeVariables+=VariableReference (SEPARATOR writeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('with' 'removeVariables' ASSOCIATION LIST_OPEN (removeVariables+=VariableReference (SEPARATOR removeVariables+=VariableReference)*)? LIST_CLOSED)? 
 	('and' 'label' ASSOCIATION label=STRING)?
 	DECLARATION_FINISHED;
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
index c997ebeb8d77688e7636a963d9a28cda047fa9f1..cacada9d54778b010d43ff10ba8b2cafdfc83621 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/TestgeneratorDSLObjectCreator.java
@@ -143,13 +143,13 @@ public class TestgeneratorDSLObjectCreator {
 			}
 			
 			
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {
@@ -170,13 +170,13 @@ public class TestgeneratorDSLObjectCreator {
 		for (Variable inputVariable : inputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(inputVariable);
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {
@@ -197,13 +197,13 @@ public class TestgeneratorDSLObjectCreator {
 		for (Variable inputVariable : inputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(inputVariable);
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {
@@ -232,13 +232,13 @@ public class TestgeneratorDSLObjectCreator {
 		for (Variable inputVariable : inputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(inputVariable);
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {
@@ -263,13 +263,13 @@ public class TestgeneratorDSLObjectCreator {
 		for (Variable inputVariable : inputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(inputVariable);
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {
@@ -291,13 +291,13 @@ public class TestgeneratorDSLObjectCreator {
 		for (Variable inputVariable : inputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(inputVariable);
-			element.getInputVariables().add(variableReference);
+			element.getReadVariables().add(variableReference);
 		}
 		
 		for (Variable outputVariable : outputVariables) {
 			VariableReference variableReference = TestgeneratorDSLFactory.eINSTANCE.createVariableReference();
 			variableReference.setRef(outputVariable);
-			element.getOutputVariables().add(variableReference);
+			element.getWriteVariables().add(variableReference);
 		}
 		
 		for (Variable removeVariable : removeVariables) {