diff --git a/src/com/sheepit/client/SettingsLoader.java b/src/com/sheepit/client/SettingsLoader.java
index e39c8b7..e2f3b71 100644
--- a/src/com/sheepit/client/SettingsLoader.java
+++ b/src/com/sheepit/client/SettingsLoader.java
@@ -124,7 +124,7 @@ public class SettingsLoader {
 			}
 			
 			if (cores != null) {
-				prop.setProperty("cpu-cores", cores);
+				prop.setProperty("cores", cores);
 			}
 			
 			if (ram != null) {
@@ -232,10 +232,14 @@ public class SettingsLoader {
 				this.gpu = prop.getProperty("compute-gpu");
 			}
 			
-			if (prop.containsKey("cpu-cores")) {
+			if (prop.containsKey("cpu-cores")) { // backward compatibility
 				this.cores = prop.getProperty("cpu-cores");
 			}
 			
+			if (prop.containsKey("cores")) {
+				this.cores = prop.getProperty("cores");
+			}
+			
 			if (prop.containsKey("ram")) {
 				this.ram = prop.getProperty("ram");
 			}