diff --git a/src/server/BaseGame.java b/src/server/BaseGame.java
index 4e0c5b4..b0fe67e 100644
--- a/src/server/BaseGame.java
+++ b/src/server/BaseGame.java
@@ -33,8 +33,10 @@
 	public static final byte MOVE_PLACE_CARD = 2;
 	public static final byte MOVE_TRASH_CARD = 3;
 	public static final byte MOVE_HINT = 4;
+
 	public static final byte HINT_COLOR = 0;
 	public static final byte HINT_VALUE = 1;
+
 	public static final byte CONNECTION_VALID = 8;
 	public static final byte CONNECTION_INVALID = 9;
 
@@ -49,14 +51,14 @@
 	final static int MAX_HINTS = 8;
 	final static int MAX_FLASHS = 3;
 
-	int nrOfPlayers = 0;
+	int nPlayers = 0;
 	static int CARDS_PER_PLAYER;
-	int cardsInDeck;
+	int nCardsInDeck;
 
 	int hints;
 	int flashs;
-	Card[][] deck;
-	int[] deckCounter;
+	Card[][] playingDeck;
+	int[] playingDeckCounter;
 	List<Card> trash;
 	BasePlayer[] players;
 	int currentPlayer;
@@ -73,27 +75,27 @@
 	}
 	
 	protected void init(){
-		createDeck(); 
+		createPlayingDeck(); 
 		createHistory();
 		createTrash();
-		CARDS_PER_PLAYER = (nrOfPlayers <= 3) ? 5 : 4;
+		CARDS_PER_PLAYER = (nPlayers <= 3) ? 5 : 4;
 		hints = MAX_HINTS;
 		flashs = 0;
-		cardsInDeck = N_CARDS;
+		nCardsInDeck = N_CARDS;
 	}
 
 	protected abstract void createHistory();
 	protected abstract void createTrash();
-	protected void createDeck(){
-		deck = new Card[COLORS][5];
-		deckCounter = new int[5];
-		for (int i=0; i<deck.length; ++i){
-			for (int j=0; j<deck[i].length; ++j){
-				deck[i][j] = Card.DUMMY_CARD;
+	protected void createPlayingDeck(){
+		playingDeck = new Card[COLORS][5];
+		playingDeckCounter = new int[5];
+		for (int i=0; i<playingDeck.length; ++i){
+			for (int j=0; j<playingDeck[i].length; ++j){
+				playingDeck[i][j] = Card.DUMMY_CARD;
 			}
 		}
 		for (int i = 0; i < 5; ++i) {
-			deckCounter[i] = 0;
+			playingDeckCounter[i] = 0;
 		}
 	}
 
@@ -101,16 +103,15 @@
 		return hints > 0;
 	}
 
-
 	protected void createPlayers() {
-		players = new BasePlayer[nrOfPlayers];
-		for(int i=0; i<nrOfPlayers; ++i){
+		players = new BasePlayer[nPlayers];
+		for(int i=0; i<nPlayers; ++i){
 			players[i] = createPlayer(i, CARDS_PER_PLAYER, "Player " + i);
 		}
 	}
 
-	protected BasePlayer createPlayer(int id, int nrOfCards, String name){
-		return new BasePlayer(id, nrOfCards, name);
+	protected BasePlayer createPlayer(int id, int nCards, String name){
+		return new BasePlayer(id, nCards, name);
 	}
 
 	protected BasePlayer createPlayer(JSONObject jo){
@@ -121,7 +122,7 @@
 	public BasePlayer getPlayer(int index){
 		return players[index];
 	}
-	
+
 	/**
 	 * Returns the state of the game at a given @param move index
 	 * @param move the index of the move you want to get.
@@ -132,7 +133,7 @@
 		final int index = move>=0 ? move : history.size()+move;
 		return history.subList(0, index);
 	}
-	
+
 	protected abstract void receive(DataInputStream inStream);
 
 	public static void Log(String msg){
@@ -152,7 +153,7 @@
 				throw new RuntimeException(e); // TODO wer faengt das?
 			}
 		}
-		
+
 		@Override
 		public void run() {
 			while(keepRunning){
diff --git a/src/server/ClientGame.java b/src/server/ClientGame.java
index 4e3bd48..be62df1 100644
--- a/src/server/ClientGame.java
+++ b/src/server/ClientGame.java
@@ -3,8 +3,8 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@
 
 	//Options stuff
 	final File options = new File("options.json");
-	JSONObject root;
+	JSONObject optionsRoot;
 	int difficulty;
 	int fontSize;
 
@@ -35,7 +35,7 @@
 	public ClientGame(){
 		preinit();
 	}
-	
+
 	protected void preinit(){
 		port = 1337;
 		hostName = "localhost";
@@ -70,13 +70,14 @@
 			Log("Client " + ownId + " waiting for game...");
 		}
 	}
-	
+
 	@Override
 	protected void init() {
 		loadOptions();
 		loadFont();
 		super.init();
 	}
+
 	@Override
 	protected void createHistory() {
 		history = new ArrayList<>();
@@ -89,16 +90,14 @@
 
 	protected void loadOptions(){
 		try {
-			JSONTokener tokener = new JSONTokener(options.toURI().toURL().openStream());
-			root = new JSONObject(tokener);
-			difficulty = root.getInt("difficulty");
-			fontSize = root.getInt("fontSize");
+			JSONTokener tokener = new JSONTokener(new FileInputStream(options));
+			optionsRoot = new JSONObject(tokener);
+			difficulty = optionsRoot.getInt("difficulty");
+			fontSize = optionsRoot.getInt("fontSize");
 			if(difficulty < 0) difficulty = 0;
 			if(fontSize <= 0) fontSize = 20;
 		} catch (JSONException e) {
 			e.printStackTrace();
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -107,7 +106,7 @@
 	protected void movePlaceCard(Card c){
 		movePlaceCard(c, false);
 	}
-	
+
 	protected void movePlaceCard(Card c, boolean isDry) {
 		byte msgType = isDry ? MOVE_PLACE_CARD | MOVE_DRY : MOVE_PLACE_CARD;
 		send(msgType, c.toJson().toString());
@@ -136,7 +135,7 @@
 			msg.put("type",  HINT_COLOR);
 		}
 		msg.put("value", value);
-		msg.put("player_id", playerId);
+		msg.put("playerId", playerId);
 		send(msgType, msg.toString());
 	}
 
@@ -174,19 +173,19 @@
 	//public abstract void printMessage(String msg, MSG_TYPES type);
 
 
-	protected abstract void createUI();
-	protected abstract void updateUI();
+	protected abstract void createUi();
+	protected abstract void updateUi();
 	
 	public int getDifficulty(){
 		return difficulty;
 	}
-	
+
 	public abstract void loadFont();
 
 	public int getFontSize(){
 		return fontSize;
 	}
-	
+
 	public Object getFont() {
 		// TODO
 		return null;
@@ -208,18 +207,18 @@
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		Log("Received magic: " + magic[0] + magic[1] + magic[2] + magic[3]);
 		Log("Received proto: " + proto);
 		Log("Received msgType: " + msgType);
 		Log("Received useless: " + useless[0] + useless[1]);
-		
+
 		// TODO check Protocol
 //		switch(proto){
 //		case VIBE_DUMB:
 //			break;
 //		}
-		
+
 		String msg = null;
 		JSONObject jo = null;
 		try {
@@ -246,33 +245,33 @@
 				Log("first update!");
 				init();
 				updateGame(jo);
-				createUI();
+				createUi();
 				initGameReceived = true;
 				break;
 			}
 			updateGame(jo);
-			updateUI();
+			updateUi();
 			break;
 		}
 	}
 
 	protected int getPlayersSightId(int id){
 		// TODO get the id of a player with ownId as 0-based index
-		return (id + (nrOfPlayers - ownId)) % nrOfPlayers;
+		return (id + (nPlayers - ownId)) % nPlayers;
 	}
 
 	protected int getRealId(int id){
 		// TODO get the real id of a player
-		return (id + ownId) % nrOfPlayers;
+		return (id + ownId) % nPlayers;
 	}
 
 	protected void updateGame(JSONObject jo){
-		nrOfPlayers = jo.getInt("nrOfPlayers");
+		nPlayers = jo.getInt("nPlayers");
 		if(!initGameReceived){
 			createPlayers();
 		}
 		// TODO movesLeft = jo.getInt("movesLeft");
-		cardsInDeck = jo.getInt("cardsInDeck");
+		nCardsInDeck = jo.getInt("nCardsInDeck");
 		hints = jo.getInt("hints");
 		flashs = jo.getInt("flashs");
 		JSONArray trashArray = jo.getJSONArray("trash");
@@ -283,17 +282,17 @@
 			trash.add(card);
 		}
 
-		JSONObject deckRow = jo.getJSONObject("deck");
-		for(int i=0; i<deck.length; ++i){
+		JSONObject deckRow = jo.getJSONObject("playingDeck");
+		for(int i=0; i<playingDeck.length; ++i){
 			JSONObject deckCol = deckRow.getJSONObject(String.valueOf(i));
-			for(int j=0; j<deck[i].length; ++j){
-				deck[i][j] = new Card(deckCol.getJSONObject(String.valueOf(j)));
+			for(int j=0; j<playingDeck[i].length; ++j){
+				playingDeck[i][j] = new Card(deckCol.getJSONObject(String.valueOf(j)));
 			}
 		}
 
-		JSONObject deckCounterObj = jo.getJSONObject("deckCounter");
-		for(int i=0; i<deckCounter.length; ++i){
-			deckCounter[i] = deckCounterObj.getInt(String.valueOf(i));
+		JSONObject deckCounterObj = jo.getJSONObject("playingDeckCounter");
+		for(int i=0; i<playingDeckCounter.length; ++i){
+			playingDeckCounter[i] = deckCounterObj.getInt(String.valueOf(i));
 		}
 
 		JSONArray playerArray = jo.getJSONArray("players");
diff --git a/src/server/ServerGame.java b/src/server/ServerGame.java
index 8b11f95..f00e0f5 100644
--- a/src/server/ServerGame.java
+++ b/src/server/ServerGame.java
@@ -22,7 +22,7 @@
 		VIBE_DUMB
 	};
 
-	List<Card> cards;
+	List<Card> cardsInDeck;
 	long seed;
 	Random rand;
 
@@ -54,14 +54,14 @@
 		sockets = new ArrayList<>();
 		try {
 			server = new ServerSocket(port);
-			while(nrOfPlayers < 2){ //TODO
+			while(nPlayers < 2){ //TODO
 				Socket socket = server.accept();
 				sockets.add(socket);
 				JSONObject connectionJson = new JSONObject();
-				connectionJson.put("id", nrOfPlayers);
+				connectionJson.put("id", nPlayers);
 				sendToClient(CONNECTION_VALID, connectionJson.toString(), socket);
-				nrOfPlayers++;
-				Log(nrOfPlayers + " players connected!");
+				nPlayers++;
+				Log(nPlayers + " players connected!");
 				// TODO do this somewhere else
 				Log("Creating new Socket Listener for #" + (sockets.size()-1));
 				Log("Socket id: " + socket);
@@ -90,7 +90,7 @@
 		movesLeft = -1;
 		createPlayers();
 		currentPlayer = 0;
-		createDeck();
+		createPlayingDeck();
 		createTrash();
 		// shuffleCards(); // TODO use this instead of addCards()
 		addCards();
@@ -98,7 +98,7 @@
 	}
 
 	protected void shuffleCards() {
-		cards = new ArrayList<>();
+		cardsInDeck = new ArrayList<>();
 		//TODO add cards
 		//TODO shuffle
 	}
@@ -218,7 +218,7 @@
 		case MOVE_HINT:
 			int hintType = jo.getInt("type");
 			int value = jo.getInt("value");
-			int player = jo.getInt("player_id");
+			int player = jo.getInt("playerId");
 			isValid = giveHint(hintType, value, player);
 			wasMove = true;
 			break;
@@ -232,7 +232,7 @@
 		if(wasMove){
 			Log("was VALID move");
 			currentPlayer++;
-			if(currentPlayer == nrOfPlayers) currentPlayer = 0;
+			if(currentPlayer == nPlayers) currentPlayer = 0;
 			// TODO notify players
 			if(movesLeft >= 0) movesLeft--;
 			String moveMsg = toJson().toString();
@@ -263,10 +263,10 @@
 		int value = card.getValue();
 
 
-		int deckValue = deckCounter[color];
+		int deckValue = playingDeckCounter[color];
 		if(deckValue == value){ //place card possible
-			deckCounter[color]++;
-			deck[color][value] = card;
+			playingDeckCounter[color]++;
+			playingDeck[color][value] = card;
 			if (value + 1 == 5) addHint();
 		} else { //card too high or too low
 			addFlash();
@@ -308,17 +308,17 @@
 	}
 
 	protected void createPlayers() {
-		players = new BasePlayer[nrOfPlayers];
-		for(int i=0; i<nrOfPlayers; ++i){
+		players = new BasePlayer[nPlayers];
+		for(int i=0; i<nPlayers; ++i){
 			players[i] = new BasePlayer(i, CARDS_PER_PLAYER, "Player " + i);
 		}
 	}
 
 	protected void dealCards() {
-		for (int dealtCards =0; dealtCards < CARDS_PER_PLAYER; ++dealtCards) {
-			for (int i = 0; i < nrOfPlayers; ++i) {
-				int index = random(cardsInDeck--);
-				Card card = cards.remove(index);
+		for(int dealtCards=0; dealtCards<CARDS_PER_PLAYER; ++dealtCards) {
+			for (int i = 0; i < nPlayers; ++i) {
+				int index = random(nCardsInDeck--);
+				Card card = cardsInDeck.remove(index);
 				players[i].setCard(dealtCards, card);
 				// TODO use this code as soon as the shuffle is implemented
 				// Card card = getCardFromDeck();
@@ -329,16 +329,16 @@
 
 	//FIXME no endless do-while...
 	private void addCards() {
-		cards = new ArrayList<>();
-		int[] dist = new int[] { 3, 2, 2, 2, 1 };
-		int[][] tmp_cards = new int[][] { dist.clone(), dist.clone(), dist.clone(), dist.clone(), dist.clone() };
+		cardsInDeck = new ArrayList<>();
+		int[] dist = new int[]{ 3, 2, 2, 2, 1 };
+		int[][] tmp_cards = new int[][]{ dist.clone(), dist.clone(), dist.clone(), dist.clone(), dist.clone() };
 		for (int i = 0; i < N_CARDS; ++i) {
 			int[] p = new int[2];
 			do {
 				p = randomPosition();
 			} while (tmp_cards[p[0]][p[1]] == 0);
 			tmp_cards[p[0]][p[1]]--;
-			cards.add(new Card(p[0], p[1], i));
+			cardsInDeck.add(new Card(p[0], p[1], i));
 		}
 	}
 
@@ -353,25 +353,25 @@
 		return rand.nextInt(max);
 	}
 
-	private void dealCard(int cardPos, int playerID) {
+	private void dealCard(int cardPos, int playerId) {
 		Card card;
-		if (cardsInDeck > 0) {
-			int index = random(cardsInDeck--);
-			card = cards.remove(index);
+		if (nCardsInDeck > 0) {
+			int index = random(nCardsInDeck--);
+			card = cardsInDeck.remove(index);
 			// TODO Use this code as soon as shuffle is implemented
 			// card = getCardFromDeck();
 		} else {
-			if (movesLeft == -1) movesLeft = nrOfPlayers;
+			if (movesLeft == -1) movesLeft = nPlayers;
 			card = Card.DUMMY_CARD;
 		}
-		players[playerID].setCard(cardPos, card);
+		players[playerId].setCard(cardPos, card);
 	}
 
 	void setWonOrLost() {
 		boolean won = true;
 		boolean lost = false;
 		for (int i = 0; i < COLORS; ++i) {
-			if (deckCounter[i] != 5) {
+			if (playingDeckCounter[i] != 5) {
 				won = false;
 				break;
 			}
@@ -457,7 +457,7 @@
 
 	protected JSONObject toJson(){
 		JSONObject root = new JSONObject();
-		root.put("cardsInDeck", cardsInDeck);
+		root.put("nCardsInDeck", nCardsInDeck);
 		root.put("hints", hints);
 		root.put("flashs", flashs);
 		root.put("movesLeft", movesLeft);
@@ -468,21 +468,21 @@
 		root.put("trash", trashArray);
 
 		JSONObject deckRow = new JSONObject();
-		for(int i=0; i<deck.length; ++i){
+		for(int i=0; i<playingDeck.length; ++i){
 			JSONObject deckCol = new JSONObject();
-			for(int j=0; j<deck[i].length; ++j){
-				deckCol.put(String.valueOf(j), deck[i][j].toJson());
+			for(int j=0; j<playingDeck[i].length; ++j){
+				deckCol.put(String.valueOf(j), playingDeck[i][j].toJson());
 				//else deckCol.put(String.valueOf(j), new JSONObject());
 			}
 			deckRow.put(String.valueOf(i), deckCol);
 		}
-		root.put("deck",  deckRow);
+		root.put("playingDeck",  deckRow);
 
 		JSONObject deckCounterObj = new JSONObject();
-		for(int i=0; i<deckCounter.length; ++i){
-			deckCounterObj.put(String.valueOf(i), deckCounter[i]);
+		for(int i=0; i<playingDeckCounter.length; ++i){
+			deckCounterObj.put(String.valueOf(i), playingDeckCounter[i]);
 		}
-		root.put("deckCounter", deckCounterObj);
+		root.put("playingDeckCounter", deckCounterObj);
 
 		JSONArray playerArray = new JSONArray();
 		for(BasePlayer p : players){
@@ -490,7 +490,7 @@
 		}
 		root.put("players", playerArray);
 		root.put("currentPlayer",  currentPlayer);
-		root.put("nrOfPlayers", nrOfPlayers);
+		root.put("nPlayers", nPlayers);
 		return root;
 	}
 
diff --git a/src/server/SwingClientGame.java b/src/server/SwingClientGame.java
index 788e8ad..6daadc2 100644
--- a/src/server/SwingClientGame.java
+++ b/src/server/SwingClientGame.java
@@ -32,10 +32,10 @@
 	JPanel gamePanel;
 	JPanel hintPanel;
 	JPanel flashPanel;
-	JPanel deckPanel;
-	JLabel[][] deckUI;
-	JLabel[] hintUI;
-	JLabel[] flashUI;
+	JPanel playingDeckPanel;
+	JLabel[][] playingDeckUi;
+	JLabel[] hintUi;
+	JLabel[] flashUi;
 	GridBagConstraints layoutConstr;
 	// Hints
 	JFrame hintFrame;
@@ -105,7 +105,7 @@
 	}
 
 	@Override
-	protected void createUI() {
+	protected void createUi() {
 		clickedPlayer = 0;
 		layoutConstr = new GridBagConstraints();
 		mainFrame = new JFrame("Hanabi - Player " + (ownId+1) + " (" + players[ownId].getName() + ")");
@@ -119,9 +119,9 @@
 		gamePanel.setLayout(new BoxLayout(gamePanel, BoxLayout.Y_AXIS));
 		GridLayout deckLayout = new GridLayout(COLORS, 5);
 
-		deckPanel = new JPanel(deckLayout);
-		deckPanel.setBackground(BACKGROUND);
-		deckUI = new JLabel[COLORS][5];
+		playingDeckPanel = new JPanel(deckLayout);
+		playingDeckPanel.setBackground(BACKGROUND);
+		playingDeckUi = new JLabel[COLORS][5];
 		for(int i=0; i<COLORS; ++i){
 			for(int j=0; j<5; ++j){
 				JLabel tmp = new JLabel("X");
@@ -129,8 +129,8 @@
 				tmp.setForeground(Color.white);
 				tmp.setFont(font);
 				tmp.setHorizontalAlignment(JLabel.CENTER);
-				deckUI[i][j] = tmp;
-				deckPanel.add(deckUI[i][j]);
+				playingDeckUi[i][j] = tmp;
+				playingDeckPanel.add(playingDeckUi[i][j]);
 			}
 		}
 		hintPanel = new JPanel();
@@ -147,10 +147,10 @@
 		mainFrame.add(new JPanel(), layoutConstr);
 
 		layoutConstr.gridx = 1;
-		if(nrOfPlayers < 5){
+		if(nPlayers < 5){
 			layoutConstr.weightx = 0.6;
 			layoutConstr.gridwidth = 1;
-			int index = (nrOfPlayers == 2) ? 1 : 2;
+			int index = (nPlayers == 2) ? 1 : 2;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
@@ -170,7 +170,7 @@
 		}
 
 		//second empty cell
-		layoutConstr.gridx = (nrOfPlayers < 5) ? 2 : 3;
+		layoutConstr.gridx = (nPlayers < 5) ? 2 : 3;
 		layoutConstr.weightx = 0.2;
 		layoutConstr.gridwidth = 1;
 		mainFrame.add(new JPanel(), layoutConstr);
@@ -181,10 +181,10 @@
 		layoutConstr.weightx = 0.2;
 		layoutConstr.weighty = 0.8;
 		layoutConstr.gridwidth = 1;
-		if(nrOfPlayers == 2 || nrOfPlayers == 3){
+		if(nPlayers == 2 || nPlayers == 3){
 			mainFrame.add(new JPanel(), layoutConstr);
 		} else {
-			int index = (nrOfPlayers == 4) ? 3 : 4;
+			int index = (nPlayers == 4) ? 3 : 4;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
@@ -193,14 +193,14 @@
 
 		layoutConstr.gridx = 1;
 		layoutConstr.weightx = 0.6;
-		layoutConstr.gridwidth = (nrOfPlayers < 5) ? 1 : 2;
+		layoutConstr.gridwidth = (nPlayers < 5) ? 1 : 2;
 		mainFrame.add(gamePanel, layoutConstr);
 
 		//2nd player
-		layoutConstr.gridx = (nrOfPlayers < 5) ? 2 : 3;
+		layoutConstr.gridx = (nPlayers < 5) ? 2 : 3;
 		layoutConstr.weightx = 0.2;
 		layoutConstr.gridwidth = 1;
-		if(nrOfPlayers == 2){
+		if(nPlayers == 2){
 			mainFrame.add(new JPanel(), layoutConstr);
 		} else {
 			//mainFrame.add(((SwingPlayer) players[1]).getContainer(), layoutConstr);
@@ -219,22 +219,22 @@
 
 		layoutConstr.gridx = 1;
 		layoutConstr.weightx = 0.6;
-		layoutConstr.gridwidth = (nrOfPlayers < 5) ? 1 : 2;
+		layoutConstr.gridwidth = (nPlayers < 5) ? 1 : 2;
 		//mainFrame.add(((SwingPlayer) players[0]).getContainer(), layoutConstr);
 		JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(0)]).getPlayerUi();
 		playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 		mainFrame.add(playerPanel, layoutConstr);
 
 		//fourth empty cell
-		layoutConstr.gridx = (nrOfPlayers < 5) ? 2 : 3;
+		layoutConstr.gridx = (nPlayers < 5) ? 2 : 3;
 		layoutConstr.weightx = 0.2;
 		layoutConstr.gridwidth = 1;
 		mainFrame.add(new JPanel(), layoutConstr);
 
 		gamePanel.add(hintPanel);
 		gamePanel.add(flashPanel);
-		gamePanel.add(deckPanel);
-		hintUI = new JLabel[MAX_HINTS];
+		gamePanel.add(playingDeckPanel);
+		hintUi = new JLabel[MAX_HINTS];
 		for(int i=0; i<MAX_HINTS; ++i){
 			JLabel tmp = new JLabel();
 			tmp.setIcon(HINT_1);
@@ -242,9 +242,9 @@
 			tmp.setName("Hint_" + i);
 			tmp.setFont(font);
 			hintPanel.add(tmp);
-			hintUI[i] = tmp;
+			hintUi[i] = tmp;
 		}
-		flashUI = new JLabel[MAX_FLASHS];
+		flashUi = new JLabel[MAX_FLASHS];
 		for(int i=0;i<MAX_FLASHS; ++i){
 			JLabel tmp = new JLabel();
 			tmp.setIcon(FLASH_0);
@@ -252,7 +252,7 @@
 			tmp.setName("Flash_" + i);
 			tmp.setFont(font);
 			flashPanel.add(tmp);
-			flashUI[i] = tmp;
+			flashUi[i] = tmp;
 		}
 		mainFrame.validate();
 		createHintUi();
@@ -274,24 +274,24 @@
 	}
 
 	@Override
-	protected void updateUI() {
+	protected void updateUi() {
 		for(int i=0; i<hints; ++i){
-			hintUI[i].setIcon(HINT_1);
+			hintUi[i].setIcon(HINT_1);
 		}
 		for(int i=hints; i<MAX_HINTS; ++i){
-			hintUI[i].setIcon(HINT_0);
+			hintUi[i].setIcon(HINT_0);
 		}
 		for(int i=0; i<flashs; ++i){
-			flashUI[i].setIcon(FLASH_1);
+			flashUi[i].setIcon(FLASH_1);
 		}
 		for(int i=flashs; i<MAX_FLASHS; ++i){
-			flashUI[i].setIcon(FLASH_0);
+			flashUi[i].setIcon(FLASH_0);
 		}
-		for(int i=0; i<deck.length; ++i){
-			for(int j=0; j<deck[i].length; ++j){
-				String value = String.valueOf(deck[i][j].getValue() + 1);
-				deckUI[i][j].setText(value);
-				deckUI[i][j].setForeground(getColor(deck[i][j].getColorInt()));
+		for(int i=0; i<playingDeck.length; ++i){
+			for(int j=0; j<playingDeck[i].length; ++j){
+				String value = String.valueOf(playingDeck[i][j].getValue() + 1);
+				playingDeckUi[i][j].setText(value);
+				playingDeckUi[i][j].setForeground(getColor(playingDeck[i][j].getColorInt()));
 			}
 		}
 	}