7 files changed, 19 insertions, 19 deletions
diff --git a/mock/jrummikub/model/MockGameState.java b/mock/jrummikub/model/MockRoundState.java
index 53e332e..9346783 100644
--- a/mock/jrummikub/model/MockGameState.java
+++ b/mock/jrummikub/model/MockRoundState.java
@@ -5,9 +5,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Mock class for {@link GameState}
+ * Mock class for {@link RoundState}
  */
-public class MockGameState implements IGameState {
+public class MockRoundState implements IRoundState {
 	/** */
 	public MockTable table;
 	/** */
@@ -20,7 +20,7 @@ public class MockGameState implements IGameState {
 	public StoneHeap gameHeap;
 
 	/** */
-	public MockGameState() {
+	public MockRoundState() {
 		table = new MockTable();
 		players = new ArrayList<MockPlayer>();
 		players.add(new MockPlayer("Player 1", Color.RED));
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/GameControl.java
index ae50b3c..14e5adc 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/GameControl.java
@@ -1,6 +1,6 @@
 package jrummikub.control;
 
-import jrummikub.model.GameState;
+import jrummikub.model.RoundState;
 import jrummikub.util.IListener;
 import jrummikub.view.IView;
 
@@ -46,7 +46,7 @@ public class GameControl {
 			return;
 		}
 
-		GameState gameState = new GameState();
+		RoundState gameState = new RoundState();
 
 		roundControl = new RoundControl(gameState, view);
 		roundControl.getEndRoundEvent().add(new IListener() {
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index c46d402..07adb99 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Set;
 
 import jrummikub.model.Hand;
-import jrummikub.model.IGameState;
+import jrummikub.model.IRoundState;
 import jrummikub.model.IHand;
 import jrummikub.model.ITable;
 import jrummikub.model.Position;
@@ -23,7 +23,7 @@ import jrummikub.view.IView;
  * Controller that manages a single round of rummikub
  */
 public class RoundControl {
-	private IGameState gameState;
+	private IRoundState gameState;
 	private IView view;
 	private ITable clonedTable;
 	private Event endRoundEvent = new Event();
@@ -37,7 +37,7 @@ public class RoundControl {
 	 * @param view
 	 *            view used for user interaction
 	 */
-	public RoundControl(IGameState gameState, IView view) {
+	public RoundControl(IRoundState gameState, IView view) {
 		this.gameState = gameState;
 		this.view = view;
 	}
diff --git a/src/jrummikub/model/IGameState.java b/src/jrummikub/model/IRoundState.java
index ebc31c5..cb6cd73 100644
--- a/src/jrummikub/model/IGameState.java
+++ b/src/jrummikub/model/IRoundState.java
@@ -1,9 +1,9 @@
 package jrummikub.model;
 
 /**
- * Interface for {@link GameState} model
+ * Interface for {@link RoundState} model
  */
-public interface IGameState {
+public interface IRoundState {
 
 	/**
 	 * Get the current {@link Table}
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/RoundState.java
index 5861a32..82d93b0 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/RoundState.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /** Class managing the overall and momentary GameState */
-public class GameState implements IGameState {
+public class RoundState implements IRoundState {
 	private ITable table;
 	private List<Player> players;
 	private int activePlayer;
@@ -14,7 +14,7 @@ public class GameState implements IGameState {
 	/** 
 	 * Create a new GameState with an empty table and (currently) 4 new players.
 	 */
-	public GameState() {
+	public RoundState() {
 		table = new Table();
 		players = new ArrayList<Player>();
 		players.add(new Player("Ida", Color.RED));
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index 1be11e4..4cfb03f 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -20,7 +20,7 @@ import java.util.Set;
 import jrummikub.model.Hand;
 import jrummikub.model.IHand;
 import jrummikub.model.ITable;
-import jrummikub.model.MockGameState;
+import jrummikub.model.MockRoundState;
 import jrummikub.model.MockTable;
 import jrummikub.model.Position;
 import jrummikub.model.Stone;
@@ -37,7 +37,7 @@ import org.junit.Test;
  */
 public class RoundControlTest {
 	private MockView view;
-	private MockGameState testGameState;
+	private MockRoundState testGameState;
 	private RoundControl testRound;
 	private MockTable newTable;
 
@@ -47,7 +47,7 @@ public class RoundControlTest {
 	@Before
 	public void setup() {
 		view = new MockView();
-		testGameState = new MockGameState();
+		testGameState = new MockRoundState();
 		testRound = new RoundControl(testGameState, view);
 		Stone stone = testGameState.getGameHeap().drawStone();
 		testGameState.table.drop(new StoneSet(stone), new Position(5, 0));
diff --git a/test/jrummikub/model/GameStateTest.java b/test/jrummikub/model/RoundStateTest.java
index 5a55aef..80b752e 100644
--- a/test/jrummikub/model/GameStateTest.java
+++ b/test/jrummikub/model/RoundStateTest.java
@@ -7,15 +7,15 @@ import java.awt.Color;
 import org.junit.Before;
 import org.junit.Test;
 /** 
- * Test class for {@link GameState}
+ * Test class for {@link RoundState}
  */
-public class GameStateTest {
-	private IGameState testGame;
+public class RoundStateTest {
+	private IRoundState testGame;
 
 	/** */
 	@Before
 	public void createGame() {
-		testGame = new GameState();
+		testGame = new RoundState();
 	}
 
 	/** */