diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json
index f47216e8b6..18c4ede0e0 100644
--- a/android/assets/jsons/Civ V - Vanilla/Buildings.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json	
@@ -258,7 +258,7 @@
 	{
 		"name": "Temple",
 		"culture": 3,
-		"specialistSlots": {"culture": 1},
+		"specialistSlots": {"Artist": 1},
 		"requiredBuilding": "Monument",
 		"maintenance": 2,
 		"hurryCostModifier": 25,
@@ -271,7 +271,7 @@
 		"uniques": ["Doubles Gold given to enemy if city is captured"],
 		"culture": 2,
 		"happiness": 2,
-		"specialistSlots": {"culture": 1},
+		"specialistSlots": {"Artist": 1},
 		"requiredBuilding": "Monument",
 		"hurryCostModifier": 25,
 		"requiredTech": "Philosophy"
@@ -281,7 +281,7 @@
 		"replaces": "Temple",
 		"uniqueTo": "Songhai",
 		"maintenance": 0,
-		"specialistSlots": {"culture": 1},
+		"specialistSlots": {"Artist": 1},
 		"hurryCostModifier": 25,
 		"culture": 4,
 		"requiredBuilding": "Monument",
@@ -308,7 +308,7 @@
 	{
 		"name": "Market",
 		"gold": 2,
-		"specialistSlots": {"gold": 1},
+		"specialistSlots": {"Merchant": 1},
 		"hurryCostModifier": 25,
 		"percentStatBonus": {"gold": 25},
 		"requiredTech": "Currency"
@@ -328,7 +328,7 @@
 		"replaces": "Market",
 		"uniqueTo": "Arabia",
 		"gold": 2,
-		"specialistSlots": {"gold": 1},
+		"specialistSlots": {"Merchant": 1},
 		"hurryCostModifier": 25,
 		"percentStatBonus": {"gold": 25},
 		"uniques": ["Provides 1 extra copy of each improved luxury resource near this City",
@@ -443,7 +443,7 @@
 		"name": "Workshop", 
 		"maintenance": 2,
 		"production": 2,
-		"specialistSlots": {"production": 1},
+		"specialistSlots": {"Engineer": 1},
 		"hurryCostModifier": 25,
 		"percentStatBonus": {"production": 10},
 		"requiredTech": "Metal Casting"
@@ -455,7 +455,7 @@
 		"cost": 100,
 		"maintenance": 2,
 		"production": 2,
-		"specialistSlots": {"production": 1},
+		"specialistSlots": {"Engineer": 1},
 		"hurryCostModifier": 25,
 		"uniques": ["[+1 Production] from [Forest] tiles in this city"],
 		"requiredTech": "Metal Casting"
@@ -482,7 +482,7 @@
 		"maintenance": 2,
 		"hurryCostModifier": 15,
 		"percentStatBonus": {"science": 33},
-		"specialistSlots": {"science": 2},
+		"specialistSlots": {"Scientist": 2},
 		"requiredBuilding": "Library",
 		"uniques": ["[+2 Science] from [Jungle] tiles in this city"],
 		"requiredTech": "Education"
@@ -494,7 +494,7 @@
 		"maintenance": 2,
 		"hurryCostModifier": 15,
 		"percentStatBonus": {"science": 33},
-		"specialistSlots": {"science": 2},
+		"specialistSlots": {"Scientist": 2},
 		"culture": 3,
 		"requiredBuilding": "Library",
 		"uniques": ["[+2 Science] from [Jungle] tiles in this city"],
@@ -594,7 +594,7 @@
 	{
 		"name": "Opera House",
 		"culture": 4,
-		"specialistSlots": {"culture": 1},
+		"specialistSlots": {"Artist": 1},
 		"hurryCostModifier": 10,
 		"requiredBuilding": "Temple",
 		"maintenance": 2,
@@ -612,7 +612,7 @@
 	{
 		"name": "Bank",
 		"gold": 2,
-		"specialistSlots": {"gold": 1},
+		"specialistSlots": {"Merchant": 1},
 		"hurryCostModifier": 15,
 		"percentStatBonus": {"gold": 25},
 		"requiredBuilding": "Market",
@@ -623,7 +623,7 @@
 		"replaces": "Bank",
 		"uniqueTo": "Persia",	
 		"gold": 2,
-		"specialistSlots": {"gold": 1},
+		"specialistSlots": {"Merchant": 1},
 		"happiness": 2,
 		"hurryCostModifier": 15,
 		"percentStatBonus": {"gold": 25},
@@ -635,7 +635,7 @@
 		"replaces": "Bank",
 		"uniqueTo": "Germany",		
 		"gold": 2,
-		"specialistSlots": {"gold": 1},
+		"specialistSlots": {"Merchant": 1},
 		"hurryCostModifier": 15,
 		"percentStatBonus": {"gold": 25},
 		"uniques": ["+5% Production for every Trade Route with a City-State in the empire"],
@@ -683,7 +683,7 @@
 	{
 		"name": "Museum",
 		"culture": 5,
-		"specialistSlots": {"culture": 2},
+		"specialistSlots": {"Artist": 2},
 		"requiredBuilding": "Opera House",
 		"maintenance": 3,
 		"hurryCostModifier": 0,
@@ -739,7 +739,7 @@
 	{
 		"name": "Windmill",
 		"production": 2,
-		"specialistSlots": {"production": 1},
+		"specialistSlots": {"Engineer": 1},
 		"hurryCostModifier": 25,
 		"maintenance": 2,
 		"uniques": ["Must not be on [Hill]", "+[10]% Production when constructing [Buildings]"],
@@ -751,7 +751,7 @@
 	{
 		"name": "Public School",
 		"science": 3,
-		"specialistSlots": {"science": 1},
+		"specialistSlots": {"Scientist": 1},
 		"requiredBuilding": "University",
 		"maintenance": 3,
 		"hurryCostModifier": 0,
@@ -762,7 +762,7 @@
 		"name": "Factory",
 		"production": 4,
 		"percentStatBonus": {"production": 10},
-		"specialistSlots": {"production": 2},
+		"specialistSlots": {"Engineer": 2},
 		"requiredBuilding": "Workshop",
 		"maintenance": 3,
 		"hurryCostModifier": 0,
@@ -809,7 +809,7 @@
 		"name": "Stock Exchange",
 		"gold": 3,
 		"percentStatBonus": {"gold": 25},
-		"specialistSlots": {"gold": 2},
+		"specialistSlots": {"Merchant": 2},
 		"hurryCostModifier": 15,
 		"requiredBuilding": "Bank",
 		"requiredTech": "Electricity"
@@ -869,7 +869,7 @@
 		"name": "Research Lab",
 		"science": 4,		
 		"percentStatBonus": {"science": 50},
-		"specialistSlots": {"science": 1},
+		"specialistSlots": {"Scientist": 1},
 		"requiredBuilding": "Public School",
 		"maintenance": 3,
 		"requiredTech": "Plastics"