diff --git a/concreteGuiManager.cpp b/concreteGuiManager.cpp
index df50aa0..864acad 100644
--- a/concreteGuiManager.cpp
+++ b/concreteGuiManager.cpp
@@ -163,10 +163,10 @@ namespace battleship{
 				button = new BuildButton(pos, size, (int)guiTable["structureId"], name, (int)guiTable["trigger"], (string)guiTable["imagePath"]);
 				break;
 			case LAND_FACTORY_TRAIN:
-				button = new TrainButton(pos, size, name, (int)guiTable["trigger"], (string)guiTable["imagePath"], (int)UnitClass::LAND_FACTORY, (int)guiTable["unitId"]);
+				button = new TrainButton(pos, size, name, (int)guiTable["trigger"], (string)guiTable["imagePath"], (int)SOL_LUA_STATE["UnitId"]["LAND_FACTORY"], (int)guiTable["unitId"]);
 				break;
 			case NAVAL_FACTORY_TRAIN:
-				button = new TrainButton(pos, size, name, (int)guiTable["trigger"], (string)guiTable["imagePath"], (int)UnitClass::NAVAL_FACTORY, (int)guiTable["unitId"]);
+				button = new TrainButton(pos, size, name, (int)guiTable["trigger"], (string)guiTable["imagePath"], (int)SOL_LUA_STATE["UnitId"]["NAVAL_FACTORY"], (int)guiTable["unitId"]);
 				break;
 			case STATISTICS:
 				button = new StatsButton(pos, size, name, (int)guiTable["trigger"], (string)guiTable["imagePath"]);
diff --git a/defConfigs.h b/defConfigs.h
index bf960a4..347bbd5 100755
--- a/defConfigs.h
+++ b/defConfigs.h
@@ -36,9 +36,9 @@ namespace battleship{
 			CORE_MAIN,
 			GUI_MAIN,
 			OPTIONS,
-			UNIT_DATA,
 			RESOURCE_DATA,
 			PROJECTILE_DATA,
+			UNIT_DATA,
 			AI_AGENT,
 			PLAYER
 		};
@@ -46,9 +46,9 @@ namespace battleship{
 			"Scripts/Core/main.lua",
 			"Scripts/Gui/main.lua",
 			"Scripts/Core/options.lua",
-			"Scripts/GameObjects/Units/unitData.lua",
 			"Scripts/GameObjects/resourceData.lua",
 			"Scripts/GameObjects/Projectiles/projectileData.lua",
+			"Scripts/GameObjects/Units/unitData.lua",
 			"Scripts/aiAgent.lua",
 			"Scripts/Core/player.lua"
 		};
diff --git a/trainButton.cpp b/trainButton.cpp
index 3017873..3bb3ab1 100644
--- a/trainButton.cpp
+++ b/trainButton.cpp
@@ -18,7 +18,7 @@ namespace battleship{
 	void TrainButton::onClick(){
 		ActiveGameState *activeState = (ActiveGameState*)(GameManager::getSingleton()->getStateManager()->getAppStateByType((int)AppStateType::ACTIVE_STATE));
 		Player *player = activeState->getPlayer();
-		UnitClass facClass = (UnitClass)generateView()["units"]["unitClass"][factoryId + 1]; 
+		UnitClass facClass = (UnitClass)generateView()["units"][factoryId + 1]["unitClass"]; 
 		vector<Unit*> factories = player->getSelectedUnitsByClass(facClass);
 
 		for(Unit *fac : factories)
diff --git a/unit.h b/unit.h
index a866c63..a57c42d 100755
--- a/unit.h
+++ b/unit.h
@@ -64,8 +64,7 @@ namespace battleship{
 	   	RESOURCE_ROVER,
 	   	CRUISER,
 	   	CARRIER,
-	   	MISSILE_SUBMARINE,
-	   	STEALTH_SUBMARINE,
+	   	SUBMARINE,
 	   	LAND_FACTORY,
 	   	NAVAL_FACTORY,
 	   	MARKET,