diff --git a/src/globals.c b/src/globals.c
index 76c658d..05c4d3d 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -52,10 +52,10 @@ const char *company_names[MAX_COMPANIES] = {
 *                      Global variable definitions                      *
 ************************************************************************/
 
-company_info_t	company[MAX_COMPANIES];	// Array of companies
-player_info_t	player[MAX_PLAYERS];	// Array of players
-map_val_t	map[MAX_X][MAX_Y];	// Map of the galaxy
-move_rec_t	move[NUMBER_MOVES];	// Current moves
+company_info_t	company[MAX_COMPANIES];		// Array of companies
+player_info_t	player[MAX_PLAYERS];		// Array of players
+map_val_t	galaxy_map[MAX_X][MAX_Y];	// Map of the galaxy
+move_rec_t	game_move[NUMBER_MOVES];	// Current moves
 
 double	interest_rate;			// Current interest rate
 double	credit_limit;			// Credit limit of current player
diff --git a/src/globals.h b/src/globals.h
index e9f87d7..6a3c515 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -116,10 +116,10 @@ extern const char *company_names[MAX_COMPANIES];
 *                     Global variable declarations                      *
 ************************************************************************/
 
-extern company_info_t	company[MAX_COMPANIES];	// Array of companies
-extern player_info_t	player[MAX_PLAYERS];	// Array of players
-extern map_val_t	map[MAX_X][MAX_Y];	// Map of the galaxy
-extern move_rec_t	move[NUMBER_MOVES];	// Current moves
+extern company_info_t	company[MAX_COMPANIES];		// Array of companies
+extern player_info_t	player[MAX_PLAYERS];		// Array of players
+extern map_val_t	galaxy_map[MAX_X][MAX_Y];	// Map of the galaxy
+extern move_rec_t	game_move[NUMBER_MOVES];	// Current moves
 
 extern double	interest_rate;		// Current interest rate
 extern double	credit_limit;		// Credit limit of current player