--- a/src/Network/Server.cc	Fri Dec 05 00:30:59 2008 +0000
+++ b/src/Network/Server.cc	Fri Dec 05 00:44:25 2008 +0000
@@ -27,7 +27,7 @@
     players.push_back(player);
     
     // add to GameState
-    state.newRemotePlayer(player);
+    state.newPlayer(player);
 }
         
 void NetworkServer::handle_disconnect (NetworkServerPlayer *player) {
@@ -39,7 +39,7 @@
 }
         
 NetworkServerPlayer::NetworkServerPlayer (NetworkServer &server, NetworkNode *node) : 
-    RemotePlayer(server.state, Vector(PLAYER_INITIAL_X, PLAYER_INITIAL_Y), true), server(server), obj(server.netobjs), node(node) {
+    Player(server.state, Vector(PLAYER_INITIAL_X, PLAYER_INITIAL_Y), true), server(server), obj(server.netobjs), node(node) {
     
     // log
     Engine::log(INFO, "server_player.connected") << "node=" << node << ", obj=" << obj;