diff --git a/src/com/sheepit/client/Configuration.java b/src/com/sheepit/client/Configuration.java
index 8b1750a..dcde335 100644
--- a/src/com/sheepit/client/Configuration.java
+++ b/src/com/sheepit/client/Configuration.java
@@ -35,7 +35,7 @@ import com.sheepit.client.os.OS;
 
 public class Configuration {
 	public enum ComputeType {
-		CPU_GPU, CPU_ONLY, GPU_ONLY
+		CPU_GPU, CPU, GPU
 	} // accept job for ...
 	
 	public File workingDirectory;
diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index 0c20868..1d67769 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -271,7 +271,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 		HttpURLConnection connection = null;
 		try {
 			String url = String.format("%s?computemethod=%s", this.getPage("request-job"), this.user_config.computeMethodToInt());
-			if (this.user_config.getComputeMethod() != ComputeType.CPU_ONLY && this.user_config.getGPUDevice() != null) {
+			if (this.user_config.getComputeMethod() != ComputeType.CPU && this.user_config.getGPUDevice() != null) {
 				String gpu_model = "";
 				try {
 					gpu_model = URLEncoder.encode(this.user_config.getGPUDevice().getModel(), "UTF-8");
diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/com/sheepit/client/standalone/Worker.java
index a26324c..fd79579 100644
--- a/src/com/sheepit/client/standalone/Worker.java
+++ b/src/com/sheepit/client/standalone/Worker.java
@@ -104,7 +104,7 @@ public class Worker {
 			return;
 		}
 		
-		ComputeType compute_method = ComputeType.CPU_ONLY;
+		ComputeType compute_method = ComputeType.CPU;
 		Configuration config = new Configuration(null, login, password);
 		config.setPrintLog(print_log);
 		
@@ -196,10 +196,10 @@ public class Worker {
 		}
 		else {
 			if (config.getGPUDevice() == null) {
-				compute_method = ComputeType.CPU_ONLY;
+				compute_method = ComputeType.CPU;
 			}
 			else {
-				compute_method = ComputeType.GPU_ONLY;
+				compute_method = ComputeType.GPU;
 			}
 		}
 		
@@ -236,7 +236,7 @@ public class Worker {
 			config.setExtras(extras);
 		}
 		
-		if (compute_method == ComputeType.CPU_ONLY && config.getGPUDevice() != null) {
+		if (compute_method == ComputeType.CPU && config.getGPUDevice() != null) {
 			System.err.println("You choose to only use the CPU but a GPU was also provided. You can not do both.");
 			System.err.println("Aborting");
 			System.exit(2);
@@ -246,12 +246,12 @@ public class Worker {
 			System.err.println("Aborting");
 			System.exit(2);
 		}
-		else if (compute_method == ComputeType.GPU_ONLY && config.getGPUDevice() == null) {
+		else if (compute_method == ComputeType.GPU && config.getGPUDevice() == null) {
 			System.err.println("You choose to only use the GPU but no GPU device was provided.");
 			System.err.println("Aborting");
 			System.exit(2);
 		}
-		else if (compute_method == ComputeType.CPU_ONLY) {
+		else if (compute_method == ComputeType.CPU) {
 			config.setUseGPU(null); // remove the GPU
 		}
 		
diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java
index f421b87..3967438 100644
--- a/src/com/sheepit/client/standalone/swing/activity/Settings.java
+++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java
@@ -130,11 +130,11 @@ public class Settings implements Activity {
 			useCPU.setSelected(true);
 			gpuChecked = true;
 		}
-		else if (method == ComputeType.CPU_ONLY) {
+		else if (method == ComputeType.CPU) {
 			useCPU.setSelected(true);
 			gpuChecked = false;
 		}
-		else if (method == ComputeType.GPU_ONLY) {
+		else if (method == ComputeType.GPU) {
 			useCPU.setSelected(false);
 			gpuChecked = true;
 		}
@@ -279,12 +279,12 @@ public class Settings implements Activity {
 				}
 			}
 			
-			ComputeType method = ComputeType.CPU_ONLY;
+			ComputeType method = ComputeType.CPU;
 			if (useCPU.isSelected() && selected_gpu == null) {
-				method = ComputeType.CPU_ONLY;
+				method = ComputeType.CPU;
 			}
 			else if (useCPU.isSelected() == false && selected_gpu != null) {
-				method = ComputeType.GPU_ONLY;
+				method = ComputeType.GPU;
 			}
 			else if (useCPU.isSelected() && selected_gpu != null) {
 				method = ComputeType.CPU_GPU;