fix bad prefixes and names every one

32 files changed, 121 insertions, 93 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index 08ee226..868d6bb 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -82,7 +82,7 @@ void arena_init()
 
 void arena_quit()
 {
-	unhot_key_register(SDLK_F3);
+	hot_key_unregister(SDLK_F3);
 }
 #endif
 
@@ -284,7 +284,7 @@ void drawSplitArena(arena_t * arena)
 {
 	tux_t *tux = NULL;
 
-	tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+	tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
 
 	if (tux != NULL) {
 		switch (splitType) {
@@ -297,7 +297,7 @@ void drawSplitArena(arena_t * arena)
 		}
 	}
 
-	tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+	tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
 
 	if (tux != NULL) {
 		drawSplitArenaForTux(arena, tux, 0, 0);
@@ -319,7 +319,7 @@ void drawSimpleArena(arena_t * arena)
 	int screen_x, screen_y;
 	tux_t *tux = NULL;
 
-	tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+	tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
 
 	if (tux == NULL) {
 		return;
@@ -340,8 +340,8 @@ void arena_draw(arena_t * arena)
 		tux_t *tux1;
 		tux_t *tux2;
 
-		tux1 = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
-		tux2 = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+		tux1 = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+		tux2 = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
 
 		if (isTuxNear(tux1, tux2)) {
 			drawCenterArena(arena, (tux1->x + tux2->x) / 2, (tux1->y + tux2->y) / 2);
@@ -355,7 +355,7 @@ void arena_draw(arena_t * arena)
 	if (isBigArena(arena)) {
 		tux_t *tux = NULL;
 
-		tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+		tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
 
 		if (tux == NULL) {
 			return;
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 4e6ef6f..45ba4ac 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -189,7 +189,7 @@ int arena_file_get_count()
 	return listArenaFile->count;
 }
 
-static char *arena_file_get_arenaStatus(textFile_t * ts, char *s)
+static char *arena_file_get_status(textFile_t * ts, char *s)
 {
 	int len;
 	int i;
@@ -212,7 +212,7 @@ char *arena_file_get_name(arenaFile_t * arenaFile)
 {
 	char *ret;
 
-	ret = arena_file_get_arenaStatus(arenaFile->map, "name");
+	ret = arena_file_get_status(arenaFile->map, "name");
 	return (ret != NULL ? ret : "arena_no_name");
 }
 
@@ -220,7 +220,7 @@ char *arena_file_get_net_name(arenaFile_t * arenaFile)
 {
 	char *ret;
 
-	ret = arena_file_get_arenaStatus(arenaFile->map, "netName");
+	ret = arena_file_get_status(arenaFile->map, "netName");
 	return (ret != NULL ? ret : "arena_no_net_name");
 }
 
@@ -242,7 +242,7 @@ arenaFile_t *arena_file_get_file_format_net_name(char *s)
 
 char *arena_file_get_image(arenaFile_t * arenaFile)
 {
-	return arena_file_get_arenaStatus(arenaFile->map, "screen");
+	return arena_file_get_status(arenaFile->map, "screen");
 }
 
 arenaFile_t *arena_file_get(int n)
diff --git a/src/base/checkFront.c b/src/base/checkFront.c
index 47adda2..6c44580 100644
--- a/src/base/checkFront.c
+++ b/src/base/checkFront.c
@@ -48,7 +48,7 @@ list_t *check_front_new()
 	return list_new();
 }
 
-void check_front_add_msg(list_t * list, char *msg, int type, int id)
+void check_front_msg_add(list_t * list, char *msg, int type, int id)
 {
 	if (type == CHECK_FRONT_TYPE_CHECK)
 		id_inc(id);
diff --git a/src/base/checkFront.h b/src/base/checkFront.h
index 2fc73b0..cde6cfd 100644
--- a/src/base/checkFront.h
+++ b/src/base/checkFront.h
@@ -13,7 +13,7 @@
 #    include "server.h"
 
 extern list_t *check_front_new();
-extern void check_front_add_msg(list_t * list, char *msg, int type, int id);
+extern void check_front_msg_add(list_t * list, char *msg, int type, int id);
 extern void check_front_event(client_t * client);
 extern void check_front_del_msg(list_t * listCheckFront, int id);
 extern void check_front_destroy(list_t * p);
diff --git a/src/base/item.c b/src/base/item.c
index 7abdde4..b7299c5 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -418,7 +418,7 @@ static void tux_event_tux_is_deadWithItem(tux_t * tux, item_t * item)
 		}
 	}
 
-	word_inc_round();
+	world_inc_round();
 	tux_event_tux_is_dead(tux);
 }
 
diff --git a/src/base/path.h b/src/base/path.h
new file mode 100644
index 0000000..155d0ac
--- /dev/null
+++ b/src/base/path.h
@@ -0,0 +1,28 @@
+
+#ifndef PATH_H
+/* #undef USE_MAGICK */
+	#define TUXANCI_VERSION				"0.21.99"
+	#define PATH_H
+	#define PREFIX					"/usr/local"
+	#ifdef PUBLIC_SERVER
+		#define APPNAME					"tuxanci-server"
+		#define SERVER_CONFIG	"/etc" "/"	APPNAME	"/server.conf"
+	#else
+		#define APPNAME					"tuxanci"
+	#endif
+	#define PATH_DIR	"/usr/local/share"	"/"	APPNAME "/"
+	// windows bug
+	#ifndef __WIN32__
+		#define PATH_MODULES 	"/usr/local/lib" "/"	APPNAME	"/"
+	#else
+		#define PATH_MODULES 	PREFIX
+	#endif
+	#define PATH_IMAGE	PATH_DIR	"images/"
+	#define PATH_ARENA	PATH_DIR	"arena/"
+	#define PATH_SOUND	PATH_DIR	"sound/"
+	#define PATH_MUSIC	PATH_DIR	"music/"
+	#define PATH_LOCALE	"/usr/local/share/locale"	"/"
+	#define PATH_DOC	"/usr/local/share/doc/tuxanci"	"/"
+	#define PACKAGE		"tuxanci"
+	#include "main.h"
+#endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 326e92d..3038cd8 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -68,15 +68,15 @@ void proto_recv_error_client(char *msg)
 	switch (errorcode) {
 		case PROTO_ERROR_CODE_BAD_VERSION:
 			analyze_set_msg(_("Version of your client isn't supported by the server."));
-			word_do_end();
+			world_do_end();
 			break;
 		case PROTO_ERROR_CODE_TIMEOUT:
 			analyze_set_msg(_("The timeout of ping from server is out"));
-			word_do_end();
+			world_do_end();
 			break;
 		case PROTO_ERROR_LIMIT_MAX_CLIENT:
 			analyze_set_msg(_("The maximum amount of connected players has been exceeded!"));
-			word_do_end();
+			world_do_end();
 			break;
 	}
 }
@@ -117,7 +117,7 @@ static void sendInfoCreateClient(client_t * client)
 	proto_send_init_server(PROTO_SEND_ONE, client, client);
 
 #ifndef PUBLIC_SERVER
-	proto_send_newtux_server(PROTO_SEND_ONE, client, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
+	proto_send_newtux_server(PROTO_SEND_ONE, client, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
 #endif
 
 	for (i = 0; i < listClient->count; i++) {
@@ -372,7 +372,7 @@ void proto_recv_init_client(char *msg)
 		return;
 	}
 
-	word_set_arena(arena_file_get_file_format_net_name(arena_name));
+	world_set_arena(arena_file_get_file_format_net_name(arena_name));
 
 	arena = arena_get_current();
 	arena->max_countRound = n;
@@ -382,9 +382,9 @@ void proto_recv_init_client(char *msg)
 	tux->x = x;
 	tux->y = y;
 	tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
-	word_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
+	world_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
 
-	public_server_get_settingNameRight(tux->name);
+	public_server_get_setting_name_right(tux->name);
 
 	space_add(arena->spaceTux, tux);
 }
@@ -964,7 +964,7 @@ void proto_recv_end_client(char *msg)
 {
 	assert(msg != NULL);
 
-	word_do_end();
+	world_do_end();
 }
 
 #endif
diff --git a/src/base/server.c b/src/base/server.c
index 16162d0..bbaf71d 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -191,7 +191,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 	int i;
 
 #ifndef PUBLIC_SERVER
-	proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
+	proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
 #endif
 
 	for (i = 0; i < listClient->count; i++) {
diff --git a/src/base/serverSendMsg.c b/src/base/serverSendMsg.c
index b1a9559..c6c9a0a 100644
--- a/src/base/serverSendMsg.c
+++ b/src/base/serverSendMsg.c
@@ -20,7 +20,7 @@ static void addMsgClient(client_t * p, char *msg, int type, int id)
 	assert(msg != NULL);
 
 	if (p->status != NET_STATUS_ZOMBIE) {
-		check_front_add_msg(p->listSendMsg, msg, type, id);
+		check_front_msg_add(p->listSendMsg, msg, type, id);
 	}
 }
 
@@ -128,7 +128,7 @@ void send_msg_to_client(int type, client_t * client, char *msg, int type2, int i
 			if (client != NULL) {
 				addMsgAllClientSeesTux(msg, client->tux, type2, id);
 			} else {
-				addMsgAllClientSeesTux(msg, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT), type2, id);
+				addMsgAllClientSeesTux(msg, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT), type2, id);
 			}
 	#endif
 	#ifdef PUBLIC_SERVER
diff --git a/src/base/tux.c b/src/base/tux.c
index aafc4fd..5a10c7a 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -362,7 +362,7 @@ static void tux_event_tux_is_deadWIthShot(tux_t * tux, shot_t * shot)
 
 	}
 
-	word_inc_round();
+	world_inc_round();
 	tux_event_tux_is_dead(tux);
 }
 
@@ -660,7 +660,7 @@ void tux_event(tux_t * tux)
 	arena = arena_get_current();
 
 #ifndef PUBLIC_SERVER
-	word_tux_control(tux);
+	world_tux_control(tux);
 #endif
 	pickUpGun(tux);
 	eventBonus(tux);
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);
diff --git a/src/screen/analyze.c b/src/screen/analyze.c
index eb20faf..3b5be95 100644
--- a/src/screen/analyze.c
+++ b/src/screen/analyze.c
@@ -94,7 +94,7 @@ void analyze_stop()
 	label_destroy(widgetLabelMsg);
 	widgetLabelMsg = label_new("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER);
 
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
diff --git a/src/screen/browser.c b/src/screen/browser.c
index a971ba4..4369fa4 100644
--- a/src/screen/browser.c
+++ b/src/screen/browser.c
@@ -124,7 +124,7 @@ void browser_stop()
 	//select_server->list = list_new();
 	select_remove_all(select_server);
 
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 
 	while (1) {
 		i = 0;
diff --git a/src/screen/choiceArena.c b/src/screen/choiceArena.c
index 4a633be..7bfee61 100644
--- a/src/screen/choiceArena.c
+++ b/src/screen/choiceArena.c
@@ -91,7 +91,7 @@ void choice_arena_event()
 
 void stopScreenChoiceArena()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void button_eventImage(void *p)
diff --git a/src/screen/credits.c b/src/screen/credits.c
index 52e5959..8aa9734 100644
--- a/src/screen/credits.c
+++ b/src/screen/credits.c
@@ -86,7 +86,7 @@ void scredits_event()
 
 void scredits_stop()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
diff --git a/src/screen/gameType.c b/src/screen/gameType.c
index 87886af..58199e8 100644
--- a/src/screen/gameType.c
+++ b/src/screen/gameType.c
@@ -177,7 +177,7 @@ void game_type_event()
 
 void stopScreenGameType()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
diff --git a/src/screen/mainMenu.c b/src/screen/mainMenu.c
index 567a1f6..d196b08 100644
--- a/src/screen/mainMenu.c
+++ b/src/screen/mainMenu.c
@@ -68,7 +68,7 @@ void main_menu_event()
 
 void main_menu_stop()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
diff --git a/src/screen/setting.c b/src/screen/setting.c
index dfcdcd7..8403056 100644
--- a/src/screen/setting.c
+++ b/src/screen/setting.c
@@ -181,7 +181,7 @@ void setting_event()
 
 void stopScreenSetting()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
@@ -434,7 +434,7 @@ void setting_init()
 #endif
 }
 
-void public_server_get_settingNameRight(char *s)
+void public_server_get_setting_name_right(char *s)
 {
 	strcpy(s, text_field_get_text(textfield_name_player1));
 }
diff --git a/src/screen/setting.h b/src/screen/setting.h
index b15ab3c..e98aa01 100644
--- a/src/screen/setting.h
+++ b/src/screen/setting.h
@@ -12,7 +12,7 @@
 extern void setting_init();
 extern void setting_draw();
 extern void setting_event();
-extern void public_server_get_settingNameRight(char *s);
+extern void public_server_get_setting_name_right(char *s);
 extern void public_server_get_settingNameLeft(char *s);
 extern void public_server_get_settingCountRound(int *n);
 extern bool_t setting_is_ai();
diff --git a/src/screen/settingKeys.c b/src/screen/settingKeys.c
index c24eadb..3e4de43 100644
--- a/src/screen/settingKeys.c
+++ b/src/screen/settingKeys.c
@@ -371,7 +371,7 @@ void
 

  stopScreenSettingKeys() 

 {

-	unhot_key_register(SDLK_ESCAPE);

+	hot_key_unregister(SDLK_ESCAPE);

 } 

 void

 

diff --git a/src/screen/table.c b/src/screen/table.c
index a21c20e..ad7232f 100644
--- a/src/screen/table.c
+++ b/src/screen/table.c
@@ -80,7 +80,7 @@ void table_event()
 
 void table_stop()
 {
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
diff --git a/src/screen/world.c b/src/screen/world.c
index 19f1094..e32ca1a 100644
--- a/src/screen/world.c
+++ b/src/screen/world.c
@@ -53,7 +53,7 @@ static bool_t isEndWorld;
 static tux_t *tuxWithControlRightKeyboard;
 static tux_t *tuxWithControlLeftKeyboard;
 
-bool_t word_is_inicialized()
+bool_t world_is_inicialized()
 {
 	return isScreenWorldInit;
 }
@@ -67,11 +67,11 @@ void setGameType()
 
 	if (ret != 0) {
 		fprintf(stderr, _("Network initialization error!\n"));
-		word_do_end();
+		world_do_end();
 	}
 }
 
-void word_set_arena(arenaFile_t * arenaFile)
+void world_set_arena(arenaFile_t * arenaFile)
 {
 	arena = arena_file_get_arena(arenaFile);
 
@@ -80,7 +80,7 @@ void word_set_arena(arenaFile_t * arenaFile)
 #endif
 }
 
-void word_do_end()
+void world_do_end()
 {
 	isEndWorld = TRUE;
 }
@@ -88,12 +88,12 @@ void word_do_end()
 static void timer_endArena()
 {
 	if (net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
-		word_do_end();
+		world_do_end();
 		return;
 	}
 }
 
-void word_inc_round()
+void world_inc_round()
 {
 	if (arena->max_countRound == WORLD_COUNT_ROUND_UNLIMITED ||
 		arena->countRound >= arena->max_countRound) {
@@ -129,14 +129,14 @@ void prepareArena()
 
 	switch (net_multiplayer_get_game_type()) {
 	case NET_GAME_TYPE_NONE:
-		word_set_arena(choice_arena_get());
+		world_set_arena(choice_arena_get());
 		item_add_new_item(arena->spaceItem, ID_UNKNOWN);
 		public_server_get_settingCountRound(&arena->max_countRound);
 
 		tux = tux_new();
 		tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
 		tuxWithControlRightKeyboard = tux;
-		public_server_get_settingNameRight(name);
+		public_server_get_setting_name_right(name);
 		tux_set_name(tux, name);
 		space_add(arena->spaceTux, tux);
 
@@ -159,14 +159,14 @@ void prepareArena()
 		break;
 
 	case NET_GAME_TYPE_SERVER:
-		word_set_arena(choice_arena_get());
+		world_set_arena(choice_arena_get());
 		item_add_new_item(arena->spaceItem, ID_UNKNOWN);
 		public_server_get_settingCountRound(&arena->max_countRound);
 
 		tux = tux_new();
 		tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
 		tuxWithControlRightKeyboard = tux;
-		public_server_get_settingNameRight(name);
+		public_server_get_setting_name_right(name);
 		tux_set_name(tux, name);
 		space_add(arena->spaceTux, tux);
 		break;
@@ -176,7 +176,7 @@ void prepareArena()
 	}
 }
 
-void word_draw()
+void world_draw()
 {
 	if (arena != NULL) {
 		arena_draw(arena);
@@ -391,7 +391,7 @@ static void eventEnd()
 	}
 }
 
-tux_t *word_get_control_tux(int control_type)
+tux_t *world_get_control_tux(int control_type)
 {
 	switch (control_type) {
 		case TUX_CONTROL_KEYBOARD_RIGHT:
@@ -405,7 +405,7 @@ tux_t *word_get_control_tux(int control_type)
 	return NULL;
 }
 
-void word_set_control_tux(tux_t * tux, int control_type)
+void world_set_control_tux(tux_t * tux, int control_type)
 {
 	switch (control_type) {
 		case TUX_CONTROL_KEYBOARD_RIGHT:
@@ -417,7 +417,7 @@ void word_set_control_tux(tux_t * tux, int control_type)
 	}
 }
 
-void word_tux_control(tux_t * p)
+void world_tux_control(tux_t * p)
 {
 	assert(p != NULL);
 
@@ -444,7 +444,7 @@ void word_tux_control(tux_t * p)
 	}
 }
 
-void word_event()
+void world_event()
 {
 	tux_t *thisTux;
 
@@ -461,11 +461,11 @@ void word_event()
 		//module_event();
 	}
 
-	thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+	thisTux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
 
 	radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_YOU);
 
-	thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+	thisTux = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
 
 	if (thisTux != NULL) {
 		radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_TUX);
@@ -481,7 +481,7 @@ void word_event()
 
 static void hotkey_escape()
 {
-	word_do_end();
+	world_do_end();
 }
 
 void startWorld()
@@ -526,8 +526,8 @@ static void setTable()
 		return;
 	}
 
-	tuxRight = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
-	tuxLeft = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+	tuxRight = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+	tuxLeft = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
 
 	if (tuxRight->score > tuxLeft->score) {
 		table_add(tuxRight->name, tuxRight->score);
@@ -545,7 +545,7 @@ void stoptWorld()
 		setAnalyze();
 	}
 
-	unhot_key_register(SDLK_ESCAPE);
+	hot_key_unregister(SDLK_ESCAPE);
 	arena_quit();
 
 	net_multiplayer_quit();
@@ -573,7 +573,7 @@ void stoptWorld()
 	id_quit_list();
 }
 
-void word_init()
+void world_init()
 {
 	assert(image_is_inicialized() == TRUE);
 	assert(tux_is_inicialized() == TRUE);
@@ -582,7 +582,7 @@ void word_init()
 	assert(screen_is_inicialized() == TRUE);
 
 	screen_register(screen_new
-				   ("world", startWorld, word_event, word_draw, stoptWorld));
+				   ("world", startWorld, world_event, world_draw, stoptWorld));
 
 #ifndef NO_SOUND
 	sound_add("dead.ogg", "dead", SOUND_GROUP_BASE);
@@ -602,7 +602,7 @@ void word_init()
 	isScreenWorldInit = TRUE;
 }
 
-void word_quit()
+void world_quit()
 {
 	DEBUG_MSG(_("Quitting screen world\n"));
 	isScreenWorldInit = FALSE;
diff --git a/src/screen/world.h b/src/screen/world.h
index 0df8a48..1030dca 100644
--- a/src/screen/world.h
+++ b/src/screen/world.h
@@ -13,18 +13,18 @@
 #    define WORLD_COUNT_ROUND_UNLIMITED	-1
 #    define LAG_SERVER_UNKNOWN		-1
 
-extern bool_t word_is_inicialized();
-extern void word_init();
-extern void word_set_arena(arenaFile_t * arenaFile);
-extern void word_do_end();
-extern void word_inc_round();
-extern tux_t *word_get_control_tux(int control_type);
-extern void word_set_control_tux(tux_t * tux, int control_type);
-extern void word_tux_control(tux_t * p);
-extern void word_draw();
-extern void word_event();
-extern void word_start();
-extern void word_stop();
-extern void word_quit();
+extern bool_t world_is_inicialized();
+extern void world_init();
+extern void world_set_arena(arenaFile_t * arenaFile);
+extern void world_do_end();
+extern void world_inc_round();
+extern tux_t *world_get_control_tux(int control_type);
+extern void world_set_control_tux(tux_t * tux, int control_type);
+extern void world_tux_control(tux_t * p);
+extern void world_draw();
+extern void world_event();
+extern void world_start();
+extern void world_stop();
+extern void world_quit();
 
 #endif
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index 5a89f42..19e2f75 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -47,7 +47,7 @@ extern int errno;
 
 #define	__PACKED__ __attribute__ ((__packed__))
 
-void word_inc_round()
+void world_inc_round()
 {
 }
 
diff --git a/src/server/publicServer.h b/src/server/publicServer.h
index 64ab1b8..f4402d2 100644
--- a/src/server/publicServer.h
+++ b/src/server/publicServer.h
@@ -9,7 +9,7 @@
 #    define WORLD_COUNT_ROUND_UNLIMITED	-1
 
 extern char *public_server_get_setting(char *env, char *param, char *default_val);
-extern void word_inc_round();
+extern void world_inc_round();
 extern int public_server_init();
 extern arenaFile_t *choice_arena_get();
 extern void eventPublicServer();