diff --git a/build/sim/botname.txt b/build/sim/botname.txt
index b49bf69d2392ada76251612c4756be780c054779..07bb3138a66f538ea0a699432c9312975b3b69c2 100644
--- a/build/sim/botname.txt
+++ b/build/sim/botname.txt
@@ -1 +1 @@
-turtlebot3_waffle
\ No newline at end of file
+waffle
\ No newline at end of file
diff --git a/src/var/FeatureModelConfigurator/adapter.config b/src/var/FeatureModelConfigurator/adapter.config
index fd4b43137f979effefd682a5d68960be63f2b517..1f2e62fb5b9d7609a1ae3d8bbbcabb8ed2b9c828 100644
--- a/src/var/FeatureModelConfigurator/adapter.config
+++ b/src/var/FeatureModelConfigurator/adapter.config
@@ -21,6 +21,7 @@
 		<!-- Path to and name of the generated .urdf.xacro file. -->
 		<urdf_xacro type="file" name="bot.urdf.xacro" path="./../../../build/sim/" />
 		<!-- Path to and name of the file stating the selected bots name. -->
-		<botname type="file" name="botname.txt" path="./../../../build/sim/" />
+		<!-- Define prefix/ postfix to be removed from the bots name to be compatible with testmanager.sh. -->
+		<botname type="file" name="botname.txt" path="./../../../build/sim/" remove_prefix="turtlebot3_" remove_suffix=""/>
 	</output>
 </adapter>
diff --git a/src/var/FeatureModelConfigurator/features/ConfiguratorMain/Adapter.java b/src/var/FeatureModelConfigurator/features/ConfiguratorMain/Adapter.java
index c20ebb4f8f23524fcfa818e8dd08c3ef370df9e0..53b3ac0ad7632b7378346914e44fc7e06e21625a 100644
--- a/src/var/FeatureModelConfigurator/features/ConfiguratorMain/Adapter.java
+++ b/src/var/FeatureModelConfigurator/features/ConfiguratorMain/Adapter.java
@@ -44,6 +44,7 @@ public class Adapter extends XMLHelper {
 			//######### Input ###############################			
 			Document adapterConfig = readXml("./adapter.config");
 			
+			//Get adapter.config values.
 			String in_fmPath = getConfigVal(adapterConfig, "input/featuremodel", "path");
 			String in_scPath = getConfigVal(adapterConfig, "input/sensorconfig", "path");
 			String in_gxPath = getConfigVal(adapterConfig, "input/gazebo_xacro", "path");
@@ -59,6 +60,10 @@ public class Adapter extends XMLHelper {
 			String out_uxName = getConfigVal(adapterConfig, "output/urdf_xacro", "name");
 			String out_bnName = getConfigVal(adapterConfig, "output/botname", "name");
 			
+			String unwantedPrefix = getConfigVal(adapterConfig, "output/botname", "remove_prefix");
+			String unwantedSuffix = getConfigVal(adapterConfig, "output/botname", "remove_suffix");
+			
+			//Declare Documents.
 			Document featureModel = readXml(in_fmPath+in_fmName);
 			List<Document> sensorConfigList = new ArrayList<Document>();
 			Document gazeboModel = null;
@@ -229,12 +234,28 @@ public class Adapter extends XMLHelper {
 			
 			
 			//######### Output result #######################
+			//Output model files.
 			saveAsXml(gazeboModel, out_gxPath+out_gxName);
 			
 			saveAsXml(urdfModel, out_uxPath+out_uxName);
 			
+			//Output botname.
+			String alteredBotName = botName;
+			if(alteredBotName.startsWith(unwantedPrefix)) {
+				alteredBotName = alteredBotName.substring(unwantedPrefix.length(), alteredBotName.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedPrefix+" could not be removed from bot name.");
+			}
+			if(alteredBotName.endsWith(unwantedSuffix)) {
+				alteredBotName = alteredBotName.substring(0, alteredBotName.length() - unwantedSuffix.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedSuffix+" could not be removed from bot name.");
+			}
+
 			BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(out_bnPath+out_bnName));
-			bufferedWriter.write(botName);
+			bufferedWriter.write(alteredBotName);
 			bufferedWriter.close();
 			//###############################################
 		}
diff --git a/src/var/FeatureModelConfigurator/src/Adapter.java b/src/var/FeatureModelConfigurator/src/Adapter.java
index c20ebb4f8f23524fcfa818e8dd08c3ef370df9e0..53b3ac0ad7632b7378346914e44fc7e06e21625a 100644
--- a/src/var/FeatureModelConfigurator/src/Adapter.java
+++ b/src/var/FeatureModelConfigurator/src/Adapter.java
@@ -44,6 +44,7 @@ public class Adapter extends XMLHelper {
 			//######### Input ###############################			
 			Document adapterConfig = readXml("./adapter.config");
 			
+			//Get adapter.config values.
 			String in_fmPath = getConfigVal(adapterConfig, "input/featuremodel", "path");
 			String in_scPath = getConfigVal(adapterConfig, "input/sensorconfig", "path");
 			String in_gxPath = getConfigVal(adapterConfig, "input/gazebo_xacro", "path");
@@ -59,6 +60,10 @@ public class Adapter extends XMLHelper {
 			String out_uxName = getConfigVal(adapterConfig, "output/urdf_xacro", "name");
 			String out_bnName = getConfigVal(adapterConfig, "output/botname", "name");
 			
+			String unwantedPrefix = getConfigVal(adapterConfig, "output/botname", "remove_prefix");
+			String unwantedSuffix = getConfigVal(adapterConfig, "output/botname", "remove_suffix");
+			
+			//Declare Documents.
 			Document featureModel = readXml(in_fmPath+in_fmName);
 			List<Document> sensorConfigList = new ArrayList<Document>();
 			Document gazeboModel = null;
@@ -229,12 +234,28 @@ public class Adapter extends XMLHelper {
 			
 			
 			//######### Output result #######################
+			//Output model files.
 			saveAsXml(gazeboModel, out_gxPath+out_gxName);
 			
 			saveAsXml(urdfModel, out_uxPath+out_uxName);
 			
+			//Output botname.
+			String alteredBotName = botName;
+			if(alteredBotName.startsWith(unwantedPrefix)) {
+				alteredBotName = alteredBotName.substring(unwantedPrefix.length(), alteredBotName.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedPrefix+" could not be removed from bot name.");
+			}
+			if(alteredBotName.endsWith(unwantedSuffix)) {
+				alteredBotName = alteredBotName.substring(0, alteredBotName.length() - unwantedSuffix.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedSuffix+" could not be removed from bot name.");
+			}
+
 			BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(out_bnPath+out_bnName));
-			bufferedWriter.write(botName);
+			bufferedWriter.write(alteredBotName);
 			bufferedWriter.close();
 			//###############################################
 		}
diff --git a/src/var/FeatureModelImplGenerator/src/Adapter.java b/src/var/FeatureModelImplGenerator/src/Adapter.java
index c20ebb4f8f23524fcfa818e8dd08c3ef370df9e0..53b3ac0ad7632b7378346914e44fc7e06e21625a 100644
--- a/src/var/FeatureModelImplGenerator/src/Adapter.java
+++ b/src/var/FeatureModelImplGenerator/src/Adapter.java
@@ -44,6 +44,7 @@ public class Adapter extends XMLHelper {
 			//######### Input ###############################			
 			Document adapterConfig = readXml("./adapter.config");
 			
+			//Get adapter.config values.
 			String in_fmPath = getConfigVal(adapterConfig, "input/featuremodel", "path");
 			String in_scPath = getConfigVal(adapterConfig, "input/sensorconfig", "path");
 			String in_gxPath = getConfigVal(adapterConfig, "input/gazebo_xacro", "path");
@@ -59,6 +60,10 @@ public class Adapter extends XMLHelper {
 			String out_uxName = getConfigVal(adapterConfig, "output/urdf_xacro", "name");
 			String out_bnName = getConfigVal(adapterConfig, "output/botname", "name");
 			
+			String unwantedPrefix = getConfigVal(adapterConfig, "output/botname", "remove_prefix");
+			String unwantedSuffix = getConfigVal(adapterConfig, "output/botname", "remove_suffix");
+			
+			//Declare Documents.
 			Document featureModel = readXml(in_fmPath+in_fmName);
 			List<Document> sensorConfigList = new ArrayList<Document>();
 			Document gazeboModel = null;
@@ -229,12 +234,28 @@ public class Adapter extends XMLHelper {
 			
 			
 			//######### Output result #######################
+			//Output model files.
 			saveAsXml(gazeboModel, out_gxPath+out_gxName);
 			
 			saveAsXml(urdfModel, out_uxPath+out_uxName);
 			
+			//Output botname.
+			String alteredBotName = botName;
+			if(alteredBotName.startsWith(unwantedPrefix)) {
+				alteredBotName = alteredBotName.substring(unwantedPrefix.length(), alteredBotName.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedPrefix+" could not be removed from bot name.");
+			}
+			if(alteredBotName.endsWith(unwantedSuffix)) {
+				alteredBotName = alteredBotName.substring(0, alteredBotName.length() - unwantedSuffix.length());
+			}
+			else {
+				System.out.println("Warning: Prefix  \'"+unwantedSuffix+" could not be removed from bot name.");
+			}
+
 			BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(out_bnPath+out_bnName));
-			bufferedWriter.write(botName);
+			bufferedWriter.write(alteredBotName);
 			bufferedWriter.close();
 			//###############################################
 		}
diff --git a/src/var/FeatureModelImplGenerator/src/ModelSetup.java b/src/var/FeatureModelImplGenerator/src/ModelSetup.java
index f6189b7318214b9e164f95db72ee4fe9e316d4bc..9cab695d60215a9d632a5cd5218555bae6b07518 100644
--- a/src/var/FeatureModelImplGenerator/src/ModelSetup.java
+++ b/src/var/FeatureModelImplGenerator/src/ModelSetup.java
@@ -42,6 +42,7 @@ public class ModelSetup extends XMLHelper{
 			//######### Input ###############################			
 			Document ModelSetupConfig = readXml("./modelsetup.config");
 			
+			//Get modelsetup.config values.
 			String in_mPath = getConfigVal(ModelSetupConfig, "input/model", "path");
 			String in_scPath = getConfigVal(ModelSetupConfig, "input/sensorconfig", "path");
 			String in_gxPath = getConfigVal(ModelSetupConfig, "input/gazebo_xacro", "path");
@@ -49,6 +50,7 @@ public class ModelSetup extends XMLHelper{
 			String in_mName = getConfigVal(ModelSetupConfig, "input/model", "name");
 			String out_mName = getConfigVal(ModelSetupConfig, "output/model", "name");
 			
+			//Declare Document.
 			Document model = readXml(in_mPath+in_mName);
 			
 			//Get sensorconfig- and gazebomodel file names.