diff --git a/src/backend/Board.java b/src/backend/Board.java
index f6158f3..529c8da 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -170,7 +170,7 @@ public class Board {
             selectedY = y;
 
             highlight.clear();
-            highlight.addAll(findCastlingMoves(p)); //the NEW UPDATED ONE for CASTLING 
+            highlight.addAll(findMovesAndCastlingMoves(p)); //the NEW UPDATED ONE for CASTLING 
         } else {
             selectedX = -1;
             selectedY = -1;
@@ -356,7 +356,7 @@ public class Board {
         return moves;
     }
     
-    public ArrayList<Position> findCastlingMoves(Piece p) {
+    public ArrayList<Position> findMovesAndCastlingMoves(Piece p) {
     	
         ArrayList<Position> moves = findMoves(p); //all the basic moves
 
diff --git a/src/backend/chessRulesCheck.java b/src/backend/ChessRulesCheck.java
similarity index 92%
rename from src/backend/chessRulesCheck.java
rename to src/backend/ChessRulesCheck.java
index 6f2e9bf..55ef588 100644
--- a/src/backend/chessRulesCheck.java
+++ b/src/backend/ChessRulesCheck.java
@@ -1,6 +1,6 @@
 package backend;
 
-public class chessRulesCheck {
+public class ChessRulesCheck {
 	
 	//The basic rules needed for CASTLING!!!!!!!!! useful for the rest of course ;)
 	
@@ -17,7 +17,7 @@ public class chessRulesCheck {
 	    return false;	
 	}
 	
-	public boolean isGoingToBeThreatenedIfItGoesThere (Board board, Piece piece, int toX, int toY ) {
+	public boolean isGoingToBeThreatenedIfItGoesThere (Board board, Piece piece, int toX, int toY ) { // I know the name sucks...;
        
 		int fromX = piece.getX();
 	    int fromY = piece.getY();