diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/.ratings b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/.ratings
index 3548849abee911c94faa36ee5517391906998d45..66dcf7acb62d98c854118af76ecf2e4cbca53fcb 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/.ratings
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/.ratings
@@ -6,4 +6,4 @@ HeaderCopyGenerator.java 18239a3adae35256e32dad19df9d8f38acbf7e66 RED
 MultiUnitMainGenerator.java 458754b89c2d79db3fee08baa444424772e40fb7 RED
 PWMActuatorExecutable.java d5d75c70ec12a3e008f744ff15b3c103b5d57f6c YELLOW
 RaspberryPIExecutable.java cafff8199da9cc59688289c9c26097e6872e9702 RED
-SingleUnitMainGenerator.java 1b9e47102a2a938e2f41fbb9f171d06d140ac86c RED
+SingleUnitMainGenerator.java f97602fcb3bd8941260b7de3b27ea1a281b0b752 RED
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/SingleUnitMainGenerator.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/SingleUnitMainGenerator.java
index 57a8f7149448d267efa3c9bd0fffc2ea6f2cd88a..f97602fcb3bd8941260b7de3b27ea1a281b0b752 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/SingleUnitMainGenerator.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/SingleUnitMainGenerator.java
@@ -321,7 +321,7 @@ class SingleUnitMainGenerator {
 			}
 			return writeCode;
 		}
-		return "FIXME(\"No executable available to write " + outport.getName() + " to " +
+		return "FIXME(\"No generator extension available to write " + outport.getName() + " to " +
 				transmitter.getName() + "\");\n";
 	}
 
@@ -344,7 +344,7 @@ class SingleUnitMainGenerator {
 			}
 			return readCode;
 		}
-		return "FIXME(\"No executable available to read " + inport.getName() + " from " +
+		return "FIXME(\"No generator extension available to read " + inport.getName() + " from " +
 				receiver.getName() + "\");\n";
 	}
 
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/.ratings b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/.ratings
index 69dfb9fbc86f281baabe72648ef4bec3be0b0ed3..d35eb93b66aa594fd72d8eb1326c755295c69fce 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/.ratings
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/.ratings
@@ -7,7 +7,7 @@ ButtonL1Executable.java ab68cddae1d323ff0ecd7956133c44d1ef0f9168 YELLOW
 ButtonL2Executable.java 336b9d8d26a682b701f7a2ca078369c9cc621fbb YELLOW
 ButtonR1Executable.java 700ef701ed77a0d3f8141166fe647ac5cd4ad570 YELLOW
 ButtonR2Executable.java 9b4acdc37505f41c60d8216c92bcbd3f43a2ccec YELLOW
-GamepadExecutableBase.java dec7e1aad421a6e09bf37b2b6f189746c2b53f12 YELLOW
+GamepadExecutableBase.java fd54ded0437b7426df3f23c724bbcda873dbcdd1 YELLOW
 Left_StickXExecutable.java c3e7f28f44fa27bd79e14ed7e60f44be2dc5a9ab YELLOW
 Left_StickYExecutable.java f81cc1e3124eb712507825bc54e7d0f633fde640 YELLOW
 Right_StickXExecutable.java ade165c88d0c6758efa167e5ba445eff87a0fd79 YELLOW
diff --git a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/GamepadExecutableBase.java b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/GamepadExecutableBase.java
index dec7e1aad421a6e09bf37b2b6f189746c2b53f12..fd54ded0437b7426df3f23c724bbcda873dbcdd1 100644
--- a/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/GamepadExecutableBase.java
+++ b/org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/gamepad/GamepadExecutableBase.java
@@ -35,7 +35,7 @@ abstract class GamepadExecutableBase<T extends EObject> extends PiHALLibraryExec
 	/** {@inheritDoc} */
 	@Override
 	public final String getSingletonVariableDeclarationCode(String singletonPostfix) {
-		return "static gamepad_configuration_t* gamepad_config" + singletonPostfix + ";\n";
+		return "static gamepad_configuration_t* gamepad_config_" + singletonPostfix + ";\n";
 	}
 
 	/** {@inheritDoc} */
@@ -61,7 +61,7 @@ abstract class GamepadExecutableBase<T extends EObject> extends PiHALLibraryExec
 
 	/** {@inheritDoc} */
 	@Override
-	public String getSingletonTerminationCode(String singletonPrefix) {
+	public final String getSingletonTerminationCode(String singletonPrefix) {
 		return "gamepad_terminate();\n";
 	}