diff --git a/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java b/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
index 5c6fb76bfe02cbb9ec72e403d760b6e6950bbe06..c7bcd12475dfaa29311ea71d806595c09f0a29ba 100644
--- a/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
+++ b/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
@@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication {
 	protected void onCreate (Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-		initialize(new UniCheckersClient(), config);
+		initialize(new SpaceCheckersClient(), config);
 	}
 }
diff --git a/CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java b/CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
similarity index 73%
rename from CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java
rename to CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
index a63bb6f8c48e5a8b9f5e48ca578ecee658b7b751..32896e74c57e998ec873328b6c1cf669a07465bf 100644
--- a/CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java
+++ b/CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
@@ -16,27 +16,18 @@ import com.mygdx.game.views.GameViewManager;
 import com.mygdx.game.views.LoadingView;
 import java.util.ArrayList;
 
-public class UniCheckersClient extends ApplicationAdapter {
+public class SpaceCheckersClient extends ApplicationAdapter {
 
 	PlayerController playerController;
 
 	private GameViewManager gvm;
-	private SpriteBatch sb;
-	private AssetManager assetManager;
-	private Stage stage;
-	private Viewport viewport;
-	private Skin skin;
-
-
-	ArrayList<PlayerController> playerControllers = new ArrayList<>();
-	NetworkController networkController;
 
 	@Override
 	public void create () {
 		Gdx.gl.glClearColor(0, 0, 1, 1);
 
-		viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-		stage = new Stage(viewport);
+		Viewport viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+		Stage stage = new Stage(viewport);
 		Gdx.input.setInputProcessor(stage);
 
 		// Initialize controllers..
@@ -44,10 +35,10 @@ public class UniCheckersClient extends ApplicationAdapter {
 		playerController = new PlayerController(networkController);
 
 		// Initialize Views..
-		sb = new SpriteBatch();
-		assetManager = new AssetManager(new InternalFileHandleResolver());
+		SpriteBatch sb = new SpriteBatch();
+		AssetManager assetManager = new AssetManager(new InternalFileHandleResolver());
 
-		skin = new Skin(Gdx.files.internal("UISkins/glassy/skin/glassy-ui.json"));
+		Skin skin = new Skin(Gdx.files.internal("UISkins/glassy/skin/glassy-ui.json"));
 		skin.getFont("font").getData().setScale(1.4F);
 		gvm = new GameViewManager();
 
diff --git a/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java b/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
index 0c464fcf1744de5172c1595f4965d8f2320347a9..a6018698ccc63a6d1db03ce668a8b332a7a021aa 100644
--- a/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
+++ b/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
@@ -2,7 +2,7 @@ package com.mygdx.game.desktop;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import com.mygdx.game.UniCheckersClient;
+import com.mygdx.game.SpaceCheckersClient;
 
 import java.io.IOException;
 
@@ -11,7 +11,7 @@ public class DesktopLauncher {
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
 		config.width = 2160;
 		config.height = 1080;
-		new LwjglApplication(new UniCheckersClient(), config);
+		new LwjglApplication(new SpaceCheckersClient(), config);
 
 	}
 
diff --git a/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java b/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
index bc2e09d4aec9fd58407edab871cbb11b77f4152b..4ad8505e1ea7420fe170c96e6e2dcc9d142c53e4 100644
--- a/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
+++ b/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
@@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication {
 	protected void onCreate (Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-		initialize(new UniCheckersServer(), config);
+		initialize(new SpaceCheckersServer(), config);
 	}
 }
diff --git a/CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java b/CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
similarity index 92%
rename from CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java
rename to CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
index d7f9232b43d7b14766903bffb275ece66e1a3ce7..ed2d17fee8a5528c821c8291d258838effe0fd40 100644
--- a/CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java
+++ b/CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
@@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.mygdx.game.controller.ServerController;
 
-public class UniCheckersServer extends ApplicationAdapter {
+public class SpaceCheckersServer extends ApplicationAdapter {
 	SpriteBatch batch;
 	Texture img;
 	
diff --git a/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java b/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
index 6c7d6df57de631cdf12fd02789e078cfdda81f78..d783d39ecf06e84356dd6e9c5b1da3e61181f5ad 100644
--- a/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
+++ b/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
@@ -2,13 +2,13 @@ package com.mygdx.game.desktop;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import com.mygdx.game.UniCheckersServer;
+import com.mygdx.game.SpaceCheckersServer;
 
 import java.io.IOException;
 
 public class DesktopLauncher {
 	public static void main (String[] arg) throws IOException {
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
-		new LwjglApplication(new UniCheckersServer(), config);
+		new LwjglApplication(new SpaceCheckersServer(), config);
 	}
 }
\ No newline at end of file