diff --git a/Software/firmware/app/include/target.h b/Software/firmware/app/include/target.h
index 92d94e2..a1d37b4 100644
--- a/Software/firmware/app/include/target.h
+++ b/Software/firmware/app/include/target.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#ifdef TARGET_SIMULATION
+#ifdef TARGET_X86
 
-#include "../../target/simulation/include/serial.h"
-#include "../../target/simulation/include/manager.h"
-#include "../../target/simulation/include/hwinit.h"
+#include "../../target/x86/include/serial.h"
+#include "../../target/x86/include/manager.h"
+#include "../../target/x86/include/hwinit.h"
 
 #elif TARGET_MAINUNIT
 
diff --git a/Software/firmware/helper/build.sh b/Software/firmware/helper/build.sh
index 8a8bd73..7c990b2 100755
--- a/Software/firmware/helper/build.sh
+++ b/Software/firmware/helper/build.sh
@@ -13,33 +13,33 @@ fi
 SOFTWARE_ROOT="${BASEDIR}/../.."
 FIRMWARE_ROOT="${SOFTWARE_ROOT}/firmware"
 CMAKE_TOOLCHAIN_FILES_ROOT="${FIRMWARE_ROOT}/helper"
-CMAKE_TOOLCHAIN_FILE_SIMULATION="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.simulation"
+CMAKE_TOOLCHAIN_FILE_X86="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.x86"
 CMAKE_TOOLCHAIN_FILE_MAINUNIT="${CMAKE_TOOLCHAIN_FILES_ROOT}/target.mainunit"
 
 #build stuff
 BUILD_ROOT="${BASEDIR}/../../../../build_womolin" # out of repo build
-BUILD_SIMULATION_ROOT="${BUILD_ROOT}/simulation"
+BUILD_X86_ROOT="${BUILD_ROOT}/x86"
 BUILD_MAINUNIT_ROOT="${BUILD_ROOT}/mainunit"
 DEBUG="debug"
 RELEASE="release"
 
 
 ###############################
-# x86 simulation debug version
+# x86 debug version
 ###############################
-#WOMOLIN_TARGET="TARGET_SIMULATION"
-#TARGET_FOLDER="${BUILD_SIMULATION_ROOT}/${DEBUG}"
-#CMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE_SIMULATION}"
-#
-#mkdir -p "${TARGET_FOLDER}"
-#cd ${TARGET_FOLDER}
-#
-#cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
-#      -DCMAKE_BUILD_TYPE=${DEBUG} \
-#      -G "Eclipse CDT4 - Unix Makefiles" \
-#      ${FIRMWARE_ROOT}
-#
-#make
+WOMOLIN_TARGET="TARGET_X86"
+TARGET_FOLDER="${BUILD_X86_ROOT}/${DEBUG}"
+CMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE_X86}"
+
+mkdir -p "${TARGET_FOLDER}"
+cd ${TARGET_FOLDER}
+
+cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
+      -DCMAKE_BUILD_TYPE=${DEBUG} \
+      -G "Eclipse CDT4 - Unix Makefiles" \
+      ${FIRMWARE_ROOT}
+
+make
 
 ###########################
 # mainunit debug version
diff --git a/Software/firmware/helper/target.simulation b/Software/firmware/helper/target.x86
similarity index 75%
rename from Software/firmware/helper/target.simulation
rename to Software/firmware/helper/target.x86
index 6f1b5e4..3e01c31 100644
--- a/Software/firmware/helper/target.simulation
+++ b/Software/firmware/helper/target.x86
@@ -1,4 +1,4 @@
-SET(WOMOLIN_TARGET "TARGET_SIMULATION")
+SET(WOMOLIN_TARGET "TARGET_X86")
 
 SET(CMAKE_CXX_COMPILER "/usr/bin/gcc")
 SET(CMAKE_CXX_COMPILER "/usr/bin/g++")
diff --git a/Software/firmware/target/CMakeLists.txt b/Software/firmware/target/CMakeLists.txt
index a6d99c1..3b4cfeb 100644
--- a/Software/firmware/target/CMakeLists.txt
+++ b/Software/firmware/target/CMakeLists.txt
@@ -1,5 +1,5 @@
-IF( ${WOMOLIN_TARGET} STREQUAL "TARGET_SIMULATION" )
-add_subdirectory(simulation)
+IF( ${WOMOLIN_TARGET} STREQUAL "TARGET_X86" )
+add_subdirectory(x86)
 ELSEIF( ${WOMOLIN_TARGET} STREQUAL "TARGET_MAINUNIT" )
 add_subdirectory(mainunit)
 ENDIF()
diff --git a/Software/firmware/target/target.h b/Software/firmware/target/target.h
index 732ab51..8a33105 100644
--- a/Software/firmware/target/target.h
+++ b/Software/firmware/target/target.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#ifdef TARGET_SIMULATION
+#ifdef TARGET_X86
 
-#include "simulation/include/serial.h"
-#include "simulation/include/manager.h"
-#include "simulation/include/hwinit.h"
+#include "x86/include/serial.h"
+#include "x86/include/manager.h"
+#include "x86/include/hwinit.h"
 
 #elif TARGET_MAINUNIT
 
diff --git a/Software/firmware/target/simulation/CMakeLists.txt b/Software/firmware/target/x86/CMakeLists.txt
similarity index 100%
rename from Software/firmware/target/simulation/CMakeLists.txt
rename to Software/firmware/target/x86/CMakeLists.txt
diff --git a/Software/firmware/target/simulation/hwinit.cpp b/Software/firmware/target/x86/hwinit.cpp
similarity index 100%
rename from Software/firmware/target/simulation/hwinit.cpp
rename to Software/firmware/target/x86/hwinit.cpp
diff --git a/Software/firmware/target/simulation/include/hwinit.h b/Software/firmware/target/x86/include/hwinit.h
similarity index 100%
rename from Software/firmware/target/simulation/include/hwinit.h
rename to Software/firmware/target/x86/include/hwinit.h
diff --git a/Software/firmware/target/simulation/include/manager.h b/Software/firmware/target/x86/include/manager.h
similarity index 100%
rename from Software/firmware/target/simulation/include/manager.h
rename to Software/firmware/target/x86/include/manager.h
diff --git a/Software/firmware/target/simulation/include/serial.h b/Software/firmware/target/x86/include/serial.h
similarity index 100%
rename from Software/firmware/target/simulation/include/serial.h
rename to Software/firmware/target/x86/include/serial.h
diff --git a/Software/firmware/target/simulation/include/unit.h b/Software/firmware/target/x86/include/unit.h
similarity index 100%
rename from Software/firmware/target/simulation/include/unit.h
rename to Software/firmware/target/x86/include/unit.h
diff --git a/Software/firmware/target/simulation/manager.cpp b/Software/firmware/target/x86/manager.cpp
similarity index 100%
rename from Software/firmware/target/simulation/manager.cpp
rename to Software/firmware/target/x86/manager.cpp
diff --git a/Software/firmware/target/simulation/serial.cpp b/Software/firmware/target/x86/serial.cpp
similarity index 100%
rename from Software/firmware/target/simulation/serial.cpp
rename to Software/firmware/target/x86/serial.cpp
diff --git a/Software/firmware/target/simulation/unit.cpp b/Software/firmware/target/x86/unit.cpp
similarity index 100%
rename from Software/firmware/target/simulation/unit.cpp
rename to Software/firmware/target/x86/unit.cpp