8 files changed, 16 insertions, 16 deletions
diff --git a/src/client/chat.c b/src/client/chat.c
index d039dcc..40296da 100644
--- a/src/client/chat.c
+++ b/src/client/chat.c
@@ -38,7 +38,7 @@ static void chat_eventDisable();
 static void hotkey_chat_esc()
 {
 	//printf("*** hotkey_chat_esc\n");
-	//unhot_key_register(SDLK_ESCAPE);
+	//hot_key_unregister(SDLK_ESCAPE);
 	chat_eventDisable();
 }
 
@@ -168,7 +168,7 @@ static void sendNewMessage()
 		char out[STR_PROTO_SIZE];
 
 		snprintf(out, STR_PROTO_SIZE, "chat %s:%s\n",
-				 word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT)->name, line);
+				 world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT)->name, line);
 
 		proto_send_chat_server(PROTO_SEND_ALL, NULL, out);
 	}
@@ -181,7 +181,7 @@ static void chat_eventDisable()
 
 	hot_key_enable(SDLK_RETURN);
 	hot_key_enable(SDLK_p);
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 
 	interface_disable_keyboard_buffer();
 	keyboard_buffer_clear();
@@ -253,6 +253,6 @@ void chat_quit()
 {
 	assert(listText != NULL);
 
-	//unhot_key_register(SDLK_RETURN);
+	//hot_key_unregister(SDLK_RETURN);
 	list_destroy_item(listText, free);
 }
diff --git a/src/client/client.c b/src/client/client.c
index 890869a..9d2971a 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -125,7 +125,7 @@ int client_init(char *ip, int port)
 		return -1;
 	}
 
-	public_server_get_settingNameRight(name);
+	public_server_get_setting_name_right(name);
 	proto_send_hello_client(name);
 
 	return 0;
@@ -135,7 +135,7 @@ static void errorWithServer()
 {
 	fprintf(stderr, _("Server did not respond!\n"));
 	analyze_set_msg(_("Server is not running or being blocked. I was unable to connect."));
-	word_do_end();
+	world_do_end();
 }
 
 void client_send(char *msg)
diff --git a/src/client/game.c b/src/client/game.c
index ef4bae8..8e0c30a 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -61,7 +61,7 @@ static void initGame()
 	item_init();
 	shot_init();
 	panel_init();
-	word_init();
+	world_init();
 
 	main_menu_init();
 	analyze_init();
@@ -98,7 +98,7 @@ void game_quit()
 	tux_quit();
 	shot_quit();
 	panel_quit();
-	word_quit();
+	world_quit();
 	image_quit();
 #ifndef NO_SOUND
 	sound_quit();
diff --git a/src/client/hotKey.c b/src/client/hotKey.c
index 94d4b24..5b981ea 100644
--- a/src/client/hotKey.c
+++ b/src/client/hotKey.c
@@ -71,7 +71,7 @@ void hot_key_register(SDLKey key, void (*handler) ())
 	list_ins(listHotKey, 0, hotkey);
 }
 
-void unhot_key_register(SDLKey key)
+void hot_key_unregister(SDLKey key)
 {
 	hotKey_t *hotkey;
 	int my_index;
diff --git a/src/client/hotKey.h b/src/client/hotKey.h
index 91d52df..95b4946 100644
--- a/src/client/hotKey.h
+++ b/src/client/hotKey.h
@@ -7,7 +7,7 @@
 
 extern void hot_key_init();
 extern void hot_key_register(SDLKey key, void (*handler) ());
-extern void unhot_key_register(SDLKey key);
+extern void hot_key_unregister(SDLKey key);
 extern void hot_key_enable(SDLKey key);
 extern void hot_key_disable(SDLKey key);
 extern void hot_key_event();
diff --git a/src/client/pauza.c b/src/client/pauza.c
index a2187d1..251c753 100644
--- a/src/client/pauza.c
+++ b/src/client/pauza.c
@@ -58,5 +58,5 @@ bool_t pauza_is_active()
 
 void pauza_quit()
 {
-	unhot_key_register(SDLK_p);
+	hot_key_unregister(SDLK_p);
 }
diff --git a/src/client/saveDialog.c b/src/client/saveDialog.c
index 5e17782..81133e7 100644
--- a/src/client/saveDialog.c
+++ b/src/client/saveDialog.c
@@ -126,7 +126,7 @@ void save_dialog_event()
 
 void save_dialog_quit()
 {
-	unhot_key_register(SDLK_F2);
+	hot_key_unregister(SDLK_F2);
 
 	label_destroy(widgetLabelMsg);
 	text_field_destroy(widgetTextFieldName);
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index 8a4acc3..57661e6 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -105,7 +105,7 @@ static arena_t *load_arenaFromLine(char *line)
 
 	sscanf(line, "%s %s %d %d", cmd, name, &countRound, &max_countRound);
 
-	word_set_arena(arena_file_get_file_format_net_name(name));
+	world_set_arena(arena_file_get_file_format_net_name(name));
 
 	arena = arena_get_current();
 	arena->max_countRound = max_countRound;
@@ -137,16 +137,16 @@ static void loadTuxFromLine(char *line, arena_t * arena)
 	tux->control = control;
 
 	if (tux->control == TUX_CONTROL_KEYBOARD_RIGHT) {
-		word_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
+		world_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
 	}
 
 	if (tux->control == TUX_CONTROL_KEYBOARD_LEFT) {
-		word_set_control_tux(tux, TUX_CONTROL_KEYBOARD_LEFT);
+		world_set_control_tux(tux, TUX_CONTROL_KEYBOARD_LEFT);
 	}
 
 	if (tux->control == TUX_CONTROL_AI) {
 		module_load("libmodAI");
-		word_set_control_tux(tux, TUX_CONTROL_KEYBOARD_LEFT);
+		world_set_control_tux(tux, TUX_CONTROL_KEYBOARD_LEFT);
 	}
 
 	space_move_object(arena->spaceTux, tux, x, y);