diff --git a/bauer/brueckenbauer.cc b/bauer/brueckenbauer.cc
index c808c95ce..89c1a0972 100644
--- a/bauer/brueckenbauer.cc
+++ b/bauer/brueckenbauer.cc
@@ -238,7 +238,7 @@ const char *check_tile( const grund_t *gr, const player_t *player, waytype_t wt,
 			return err_msg;
 		}
 	}
-	return "";	// could end here but must not end here
+	return "";	// could end here but need not end here
 }
 
 bool bridge_builder_t::is_blocked(koord3d pos, ribi_t::ribi check_ribi, const char *&error_msg)
diff --git a/bauer/brueckenbauer.h b/bauer/brueckenbauer.h
index e315c1058..cfe72806c 100644
--- a/bauer/brueckenbauer.h
+++ b/bauer/brueckenbauer.h
@@ -39,7 +39,7 @@ public:
 	 * -#  If ai_bridge==false then looks for end location at a sloped tile.
 	 * -#  If ai_bridge==true returns the first location (taking min_length into account)
 	 *     for the bridge end (including flat tiles).
-	 * @param sp active player, needed to check scenario conditions
+	 * @param player active player, needed to check scenario conditions
 	 * @param pos  the position of the start of the bridge
 	 * @param zv   desired direction of the bridge
 	 * @param desc the description of the bridge
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Checks whether given tile @p gr is suitable for placing bridge ramp.
 	 *
-	 * @param sp the player wanting to build the  bridge.
+	 * @param player the player wanting to build the  bridge.
 	 * @param gr the ground to check.
 	 * @return true, if bridge ramp can be built here.
 	 */
@@ -71,7 +71,7 @@ public:
 	/**
 	 * Build a bridge ramp.
 	 *
-	 * @param sp the player wanting to build the bridge
+	 * @param player the player wanting to build the bridge
 	 * @param end the position of the ramp
 	 * @param zv direction the bridge will face
 	 * @param desc the bridge description.
@@ -83,7 +83,7 @@ public:
 	 * Therefore checks should be done before in
 	 * bridge_builder_t::build().
 	 *
-	 * @param sp the master builder of the bridge.
+	 * @param player the master builder of the bridge.
 	 * @param start start position.
 	 * @param end end position
 	 * @param zv direction the bridge will face
@@ -111,7 +111,7 @@ public:
 	 * Builds the bridge and performs all checks.
 	 * This is the main construction routine.
 	 *
-	 * @param sp The player wanting to build the bridge.
+	 * @param player The player wanting to build the bridge.
 	 * @param pos the start of the bridge.
 	 * @param desc Description of the bridge to build
 	 * @return NULL on success or error message otherwise
@@ -120,7 +120,7 @@ public:
 
 	/**
 	 * Removes a bridge
-	 * @param sp the demolisher and owner of the bridge
+	 * @param player the demolisher and owner of the bridge
 	 * @param pos position anywhere on a bridge.
 	 * @param wegtyp way type of the bridge
 	 * @return An error message if the bridge could not be removed, NULL otherwise
diff --git a/bauer/hausbauer.cc b/bauer/hausbauer.cc
index 58b863d6f..0f7ded4f9 100644
--- a/bauer/hausbauer.cc
+++ b/bauer/hausbauer.cc
@@ -451,7 +451,7 @@ void hausbauer_t::remove( player_t *player, gebaeude_t *gb )
 }
 
 
-gebaeude_t* hausbauer_t::build(player_t* player_, koord3d pos, int org_layout, const building_desc_t* desc, void* param)
+gebaeude_t* hausbauer_t::build(player_t* player, koord3d pos, int org_layout, const building_desc_t* desc, void* param)
 {
 	gebaeude_t* first_building = NULL;
 	koord k;
@@ -476,7 +476,7 @@ gebaeude_t* hausbauer_t::build(player_t* player_, koord3d pos, int org_layout, c
 						DBG_MESSAGE("hausbauer_t::build()","get_tile() empty at %i,%i",k.x,k.y);
 				continue;
 			}
-			gebaeude_t *gb = new gebaeude_t(pos + k, player_, tile);
+			gebaeude_t *gb = new gebaeude_t(pos + k, player, tile);
 			if (first_building == NULL) {
 				first_building = gb;
 			}
@@ -515,7 +515,7 @@ gebaeude_t* hausbauer_t::build(player_t* player_, koord3d pos, int org_layout, c
 					}
 
 					// delete everything except vehicles
-					gr->obj_loesche_alle(player_);
+					gr->obj_loesche_alle(player);
 				}
 
 				// build new foundation
diff --git a/bauer/tunnelbauer.cc b/bauer/tunnelbauer.cc
index 2919bfba4..5eabc243a 100644
--- a/bauer/tunnelbauer.cc
+++ b/bauer/tunnelbauer.cc
@@ -618,7 +618,7 @@ void tunnel_builder_t::build_tunnel_portal(player_t *player, koord3d end, koord
 	if( ground_outside) {
 		weg_t *way_outside = ground_outside->get_weg( desc->get_waytype() );
 		if( way_outside ) {
-			// use the check_owner routine of way_builder_t (not spieler_t!), needs an instance
+			// use the check_owner routine of way_builder_t (not player_t!), needs an instance
 			way_builder_t bauigel(player);
 			bauigel.init_builder( (way_builder_t::bautyp_t)desc->get_waytype(), way_outside->get_desc());
 			sint32 dummy;
diff --git a/bauer/wegbauer.cc b/bauer/wegbauer.cc
index 48aa344ff..6b0152a0d 100644
--- a/bauer/wegbauer.cc
+++ b/bauer/wegbauer.cc
@@ -328,7 +328,7 @@ void way_builder_t::fill_menu(tool_selector_t *tool_selector, const waytype_t wt
 /* allow for railroad crossing
  * @author prissi
  */
-bool way_builder_t::check_crossing(const koord zv, const grund_t *bd, waytype_t wtyp0, const player_t *player_) const
+bool way_builder_t::check_crossing(const koord zv, const grund_t *bd, waytype_t wtyp0, const player_t *player) const
 {
 	const waytype_t wtyp = wtyp0==tram_wt ? track_wt : wtyp0;
 	// nothing to cross here
@@ -356,7 +356,7 @@ bool way_builder_t::check_crossing(const koord zv, const grund_t *bd, waytype_t
 		return true;
 	}
 	// right owner of the other way
-	if(!check_owner(w->get_owner(),player_)) {
+	if(!check_owner(w->get_owner(),player)) {
 		return false;
 	}
 	// check for existing crossing
@@ -1161,9 +1161,9 @@ void way_builder_t::check_for_bridge(const grund_t* parent_from, const grund_t*
 }
 
 
-way_builder_t::way_builder_t(player_t* player_) : next_gr(32)
+way_builder_t::way_builder_t(player_t* player) : next_gr(32)
 {
-	player_builder     = player_;
+	player_builder     = player;
 	bautyp = strasse;   // kann mit init_builder() gesetzt werden
 	maximum = 2000;// CA $ PER TILE
 
diff --git a/bauer/wegbauer.h b/bauer/wegbauer.h
index 9f37da665..3360a1e3a 100644
--- a/bauer/wegbauer.h
+++ b/bauer/wegbauer.h
@@ -208,7 +208,7 @@ public:
 
 	void set_maximum(uint32 n) { maximum = n; }
 
-	way_builder_t(player_t *player_);
+	way_builder_t(player_t *player);
 
 	void calc_straight_route(const koord3d start, const koord3d ziel);
 	void calc_route(const koord3d &start3d, const koord3d &ziel);
@@ -219,7 +219,7 @@ public:
 	*/
 	sint64 calc_costs();
 
-	bool check_crossing(const koord zv, const grund_t *bd,waytype_t wtyp, const player_t *player_) const;
+	bool check_crossing(const koord zv, const grund_t *bd,waytype_t wtyp, const player_t *player) const;
 	bool check_powerline(const koord zv, const grund_t *bd) const;
 	// allowed owner?
 	bool check_owner( const player_t *player1, const player_t *player2 ) const;
diff --git a/boden/grund.cc b/boden/grund.cc
index f57bf6a98..03d3f1ca4 100644
--- a/boden/grund.cc
+++ b/boden/grund.cc
@@ -1947,7 +1947,7 @@ int grund_t::get_max_speed() const
 }
 
 
-bool grund_t::remove_everything_from_way(player_t* player_, waytype_t wt, ribi_t::ribi rem)
+bool grund_t::remove_everything_from_way(player_t* player, waytype_t wt, ribi_t::ribi rem)
 {
 	// check, if the way must be totally removed?
 	weg_t *weg = get_weg(wt);
@@ -1957,7 +1957,7 @@ bool grund_t::remove_everything_from_way(player_t* player_, waytype_t wt, ribi_t
 		const koord here = pos.get_2d();
 
 		// stops
-		if(flags&is_halt_flag  &&  (get_halt()->get_owner()==player_  || player_==welt->get_public_player())) {
+		if(flags&is_halt_flag  &&  (get_halt()->get_owner()==player  || player==welt->get_public_player())) {
 			bool remove_halt = get_typ()!=boden;
 			// remove only if there is no other way
 			if(get_weg_nr(1)==NULL) {
@@ -1978,7 +1978,7 @@ bool grund_t::remove_everything_from_way(player_t* player_, waytype_t wt, ribi_t
 #endif
 			}
 			if (remove_halt) {
-				if (!haltestelle_t::remove(player_, pos)) {
+				if (!haltestelle_t::remove(player, pos)) {
 					return false;
 				}
 			}
@@ -2046,7 +2046,7 @@ bool grund_t::remove_everything_from_way(player_t* player_, waytype_t wt, ribi_t
 					if((flags&has_way2)==0) {
 						if (add==ribi_t::none) {
 							// last way was belonging to this tunnel
-							tunnel->cleanup(player_);
+							tunnel->cleanup(player);
 							delete tunnel;
 						}
 					}
@@ -2074,7 +2074,7 @@ bool grund_t::remove_everything_from_way(player_t* player_, waytype_t wt, ribi_t
 				// make tunnel portals to normal ground
 				if (get_typ()==tunnelboden  &&  (flags&has_way1)==0) {
 					// remove remaining objs
-					obj_loesche_alle( player_ );
+					obj_loesche_alle( player );
 					// set to normal ground
 					welt->access(here)->kartenboden_setzen( new boden_t( pos, slope ) );
 					// now this is already deleted !
@@ -2089,7 +2089,7 @@ DBG_MESSAGE("tool_wayremover()","change remaining way to ribi %d",add);
 		}
 		// we have to pay?
 		if(costs) {
-			player_t::book_construction_costs(player_, costs, here, finance_wt);
+			player_t::book_construction_costs(player, costs, here, finance_wt);
 		}
 	}
 	return true;
diff --git a/boden/grund.h b/boden/grund.h
index 6aa6689b0..0d2c75500 100644
--- a/boden/grund.h
+++ b/boden/grund.h
@@ -782,7 +782,7 @@ public:
 	 * A new way is built with the given ribis. Registered and assigned to the builder.
 	 * @param weg	    der neue Weg
 	 * @param ribi	    die neuen ribis
-	 * @param sp	    Player building the way
+	 * @param player    Player building the way
 	 *
 	 * @author V. Meyer
 	 */
diff --git a/display/viewport.cc b/display/viewport.cc
index beb95f56d..1bb785ed1 100644
--- a/display/viewport.cc
+++ b/display/viewport.cc
@@ -190,7 +190,7 @@ grund_t* viewport_t::get_ground_on_screen_coordinate(scr_coord screen_pos, sint3
 		if (gr != NULL) {
 			found = /*select_karten_boden ? gr->ist_karten_boden() :*/ gr->is_visible();
 			if( ( gr->get_typ() == grund_t::tunnelboden || gr->get_typ() == grund_t::monorailboden ) && gr->get_weg_nr(0) == NULL && !gr->get_leitung()  &&  gr->find<zeiger_t>()) {
-				// This is only a dummy ground placed by tool_build_tunnel or tool_build_way_t as a preview.
+				// This is only a dummy ground placed by tool_build_tunnel_t or tool_build_way_t as a preview.
 				found = false;
 			}
 			if (found) {
@@ -223,7 +223,7 @@ grund_t* viewport_t::get_ground_on_screen_coordinate(scr_coord screen_pos, sint3
 		if(gr != NULL) {
 			found = /*select_karten_boden ? gr->ist_karten_boden() :*/ gr->is_visible();
 			if( ( gr->get_typ() == grund_t::tunnelboden || gr->get_typ() == grund_t::monorailboden ) && gr->get_weg_nr(0) == NULL && !gr->get_leitung()  &&  gr->find<zeiger_t>()) {
-				// This is only a dummy ground placed by tool_build_tunnel or tool_build_way_t as a preview.
+				// This is only a dummy ground placed by tool_build_tunnel_t or tool_build_way_t as a preview.
 				found = false;
 			}
 			if (found) {
diff --git a/gui/karte.h b/gui/karte.h
index df4811534..97875a772 100644
--- a/gui/karte.h
+++ b/gui/karte.h
@@ -88,10 +88,10 @@ private:
 		uint8 end_offset;
 		bool start_diagonal;
 		line_segment_t() {}
-		line_segment_t( koord s, uint8 so, koord e, uint8 eo, schedule_t *f, player_t *player_, uint8 cc, bool diagonal ) {
+		line_segment_t( koord s, uint8 so, koord e, uint8 eo, schedule_t *f, player_t *p, uint8 cc, bool diagonal ) {
 			schedule = f;
 			waytype = f->get_waytype();
-			player = player_;
+			player = p;
 			colorcount = cc;
 			start_diagonal = diagonal;
 			if(  s.x<e.x  ||  (s.x==e.x  &&  s.y<e.y)  ) {
diff --git a/gui/kennfarbe.cc b/gui/kennfarbe.cc
index 2092b063d..ba41f6d2f 100644
--- a/gui/kennfarbe.cc
+++ b/gui/kennfarbe.cc
@@ -37,7 +37,7 @@ farbengui_t::farbengui_t(player_t *player_) :
 	gui_frame_t( translator::translate("Farbe"), player_ ),
 	txt(&buf)
 {
-	this->player = player_;
+	player = player_;
 	buf.clear();
 	buf.append(translator::translate("COLOR_CHOOSE\n"));
 
@@ -49,7 +49,7 @@ farbengui_t::farbengui_t(player_t *player_) :
 	add_component( &txt );
 
 	// Picture
-	new_component<gui_image_t>(skinverwaltung_t::color_options->get_image_id(0), player_->get_player_nr(), ALIGN_NONE, true);
+	new_component<gui_image_t>(skinverwaltung_t::color_options->get_image_id(0), player->get_player_nr(), ALIGN_NONE, true);
 	end_table();
 
 	// Player's primary color label
@@ -59,7 +59,7 @@ farbengui_t::farbengui_t(player_t *player_) :
 	uint32 used_colors1 = 0;
 	uint32 used_colors2 = 0;
 	for(  int i=0;  i<MAX_PLAYER_COUNT;  i++  ) {
-		if(  i!=player_->get_player_nr()  &&  welt->get_player(i)  ) {
+		if(  i!=player->get_player_nr()  &&  welt->get_player(i)  ) {
 			used_colors1 |= 1 << (welt->get_player(i)->get_player_color1() / 8);
 			used_colors2 |= 1 << (welt->get_player(i)->get_player_color2() / 8);
 		}
@@ -73,7 +73,7 @@ farbengui_t::farbengui_t(player_t *player_) :
 		player_color_1[i]->background_color = color_idx_to_rgb(i*8+4);
 		player_color_1[i]->add_listener(this);
 	}
-	player_color_1[player_->get_player_color1()/8]->pressed = true;
+	player_color_1[player->get_player_color1()/8]->pressed = true;
 	end_table();
 
 	// Player's secondary color label
@@ -87,7 +87,7 @@ farbengui_t::farbengui_t(player_t *player_) :
 		player_color_2[i]->background_color = color_idx_to_rgb(i*8+4);
 		player_color_2[i]->add_listener(this);
 	}
-	player_color_2[player_->get_player_color2()/8]->pressed = true;
+	player_color_2[player->get_player_color2()/8]->pressed = true;
 	end_table();
 
 	reset_min_windowsize();
diff --git a/gui/kennfarbe.h b/gui/kennfarbe.h
index e47fec86a..7954c13df 100644
--- a/gui/kennfarbe.h
+++ b/gui/kennfarbe.h
@@ -36,7 +36,7 @@ class farbengui_t : public gui_frame_t, action_listener_t
 		choose_color_button_t* player_color_2[28];
 
 	public:
-		farbengui_t(player_t *player);
+		farbengui_t(player_t *player_);
 
 		/**
 		 * Set the window associated helptext
diff --git a/gui/line_management_gui.h b/gui/line_management_gui.h
index 85b20a28e..86d140666 100644
--- a/gui/line_management_gui.h
+++ b/gui/line_management_gui.h
@@ -14,7 +14,7 @@ class loadsave_t;
 class line_management_gui_t : public schedule_gui_t
 {
 public:
-	line_management_gui_t(linehandle_t line = linehandle_t(), player_t* player = NULL);
+	line_management_gui_t(linehandle_t line = linehandle_t(), player_t* player_ = NULL);
 	virtual ~line_management_gui_t();
 
 	bool infowin_event(event_t const*) OVERRIDE;
diff --git a/gui/player_frame_t.cc b/gui/player_frame_t.cc
index 9a0a139e1..7792e6144 100644
--- a/gui/player_frame_t.cc
+++ b/gui/player_frame_t.cc
@@ -64,7 +64,7 @@ ki_kontroll_t::ki_kontroll_t() :
 
 	for(int i=0; i<MAX_PLAYER_COUNT-1; i++) {
 
-		const player_t *const player_ = welt->get_player(i);
+		const player_t *const player = welt->get_player(i);
 
 		// activate player buttons
 		// .. not available for the two first players (first human and second public)
@@ -73,7 +73,7 @@ ki_kontroll_t::ki_kontroll_t() :
 			player_active[i-2].init(button_t::square_state, "");
 			player_active[i-2].add_listener(this);
 			player_active[i-2].set_rigid(true);
-			player_active[i-2].set_visible(player_  &&  player_->get_ai_id()!=player_t::HUMAN  &&  player_tools_allowed);
+			player_active[i-2].set_visible(player  &&  player->get_ai_id()!=player_t::HUMAN  &&  player_tools_allowed);
 			add_component( player_active+i-2 );
 		}
 		else {
@@ -87,11 +87,11 @@ ki_kontroll_t::ki_kontroll_t() :
 		add_component(player_change_to+i);
 
 		// Allow player change to human and public only (no AI)
-		player_change_to[i].set_visible(player_  &&  player_change_allowed);
+		player_change_to[i].set_visible(player  &&  player_change_allowed);
 
 		// Prepare finances button
 		player_get_finances[i].init( button_t::box | button_t::flexible, "");
-		player_get_finances[i].background_color = PLAYER_FLAG | color_idx_to_rgb((player_ ? player_->get_player_color1():i*8)+4);
+		player_get_finances[i].background_color = PLAYER_FLAG | color_idx_to_rgb((player ? player->get_player_color1():i*8)+4);
 		player_get_finances[i].add_listener(this);
 
 		// Player type selector, Combobox
@@ -115,8 +115,8 @@ ki_kontroll_t::ki_kontroll_t() :
 
 		add_component( player_get_finances+i );
 		add_component( player_select+i );
-		if(  player_ != NULL  ) {
-			player_get_finances[i].set_text( player_->get_name() );
+		if(  player != NULL  ) {
+			player_get_finances[i].set_text( player->get_name() );
 			player_select[i].set_visible(false);
 		}
 		else {
@@ -126,7 +126,7 @@ ki_kontroll_t::ki_kontroll_t() :
 
 		// password/locked button
 		player_lock[i] = new_component<password_button_t>();
-		player_lock[i]->background_color = color_idx_to_rgb((player_ && player_->is_locked()) ? (player_->is_unlock_pending() ? COL_YELLOW : COL_RED) : COL_GREEN);
+		player_lock[i]->background_color = color_idx_to_rgb((player && player->is_locked()) ? (player->is_unlock_pending() ? COL_YELLOW : COL_RED) : COL_GREEN);
 		player_lock[i]->enable( welt->get_player(i) );
 		player_lock[i]->add_listener(this);
 		player_lock[i]->set_rigid(true);
diff --git a/gui/signal_spacing.cc b/gui/signal_spacing.cc
index 06b2835aa..f1f0d5e57 100644
--- a/gui/signal_spacing.cc
+++ b/gui/signal_spacing.cc
@@ -1,6 +1,6 @@
 /*
  * Dialogue to set the signal spacing, when CTRL+clicking a signal on toolbar
- * Used by tool_roadsign_t
+ * Used by tool_build_roadsign_t
  */
 
 #include "gui_frame.h"
diff --git a/gui/signal_spacing.h b/gui/signal_spacing.h
index bad5cfe23..e300d12dd 100644
--- a/gui/signal_spacing.h
+++ b/gui/signal_spacing.h
@@ -1,6 +1,6 @@
 /*
  * Dialogue to set the signal spacing, when CTRL+clicking a signal on toolbar
- * Used by tool_roadsign_t
+ * Used by tool_build_roadsign_t
  */
 
 #ifndef signal_spacing_h
diff --git a/obj/crossing.cc b/obj/crossing.cc
index 368888d64..f0ebcd668 100644
--- a/obj/crossing.cc
+++ b/obj/crossing.cc
@@ -42,14 +42,14 @@ crossing_t::crossing_t(loadsave_t* const file) : obj_no_info_t()
 }
 
 
-crossing_t::crossing_t(player_t* const player_, koord3d const pos, crossing_desc_t const* const desc, uint8 const ns) : obj_no_info_t(pos)
+crossing_t::crossing_t(player_t* const player, koord3d const pos, crossing_desc_t const* const desc, uint8 const ns) : obj_no_info_t(pos)
 {
 	this->ns = ns;
 	this->desc = desc;
 	logic = NULL;
 	state = crossing_logic_t::CROSSING_INVALID;
 	image = foreground_image = IMG_EMPTY;
-	set_owner( player_ );
+	set_owner( player );
 }
 
 
diff --git a/player/ai_goods.cc b/player/ai_goods.cc
index cde7707f8..ad2838179 100644
--- a/player/ai_goods.cc
+++ b/player/ai_goods.cc
@@ -1512,7 +1512,7 @@ void ai_goods_t::fabconnection_t::rdwr(loadsave_t *file)
 void ai_goods_t::report_vehicle_problem(convoihandle_t cnv,const koord3d ziel)
 {
 	if(  cnv->get_state() == convoi_t::NO_ROUTE  &&  this!=welt->get_active_player()  ) {
-			DBG_MESSAGE("ai_passenger_t::bescheid_vehikel_problem","Vehicle %s can't find a route to (%i,%i)!", cnv->get_name(),ziel.x,ziel.y);
+			DBG_MESSAGE("ai_passenger_t::report_vehicle_problem","Vehicle %s can't find a route to (%i,%i)!", cnv->get_name(),ziel.x,ziel.y);
 			cnv->self_destruct();
 			return;
 	}
diff --git a/player/ai_passenger.cc b/player/ai_passenger.cc
index 9bc9e5f31..9640b380f 100644
--- a/player/ai_passenger.cc
+++ b/player/ai_passenger.cc
@@ -1456,7 +1456,7 @@ void ai_passenger_t::rdwr(loadsave_t *file)
 void ai_passenger_t::report_vehicle_problem(convoihandle_t cnv,const koord3d ziel)
 {
 	if(  cnv->get_state() == convoi_t::NO_ROUTE  &&  this!=welt->get_active_player()  ) {
-			DBG_MESSAGE("ai_passenger_t::bescheid_vehikel_problem","Vehicle %s can't find a route to (%i,%i)!", cnv->get_name(),ziel.x,ziel.y);
+			DBG_MESSAGE("ai_passenger_t::report_vehicle_problem","Vehicle %s can't find a route to (%i,%i)!", cnv->get_name(),ziel.x,ziel.y);
 			cnv->self_destruct();
 			return;
 	}
diff --git a/player/simplay.h b/player/simplay.h
index d1430f4bd..9bb5547b4 100644
--- a/player/simplay.h
+++ b/player/simplay.h
@@ -262,7 +262,7 @@ public:
 	static bool check_owner( const player_t *owner, const player_t *test );
 
 	/**
-	 * @param player_nr Number assigned to this player, it's a ID.
+	 * @param player_nr Number assigned to this player - it's an ID.
 	 * @author Hj. Malthaner
 	 */
 	player_t(uint8 player_nr );
@@ -300,9 +300,8 @@ public:
 	/**
 	 * Displays messages from the queue of the player on the screen
 	 * Show income messages
-	 * @author Hj. Malthaner
-     * @author prissi
-     */
+	 * @author prissi
+	 */
 	void display_messages();
 
 	/**
@@ -326,10 +325,10 @@ public:
 	virtual void new_year() {}
 
 	/**
-     * Stores/loads the player state
-     * @param file where the data will be saved/loaded
-     * @author Hj. Malthaner
-     */
+	 * Stores/loads the player state
+	 * @param file where the data will be saved/loaded
+	 * @author Hj. Malthaner
+	 */
 	virtual void rdwr(loadsave_t *file);
 
 	/*
@@ -389,17 +388,17 @@ public:
 	void init_undo(waytype_t t, unsigned short max );
 
 	/**
-     * Function for UNDO
-     * @date 7-Feb-2005
-     * @author prissi
-     */
+	 * Function for UNDO
+	 * @date 7-Feb-2005
+	 * @author prissi
+	 */
 	void add_undo(koord3d k);
 
 	/**
-     * Function for UNDO
-     * @date 7-Feb-2005
-     * @author prissi
-     */
+	 * Function for UNDO
+	 * @date 7-Feb-2005
+	 * @author prissi
+	 */
 	sint64 undo();
 
 private:
diff --git a/script/api_param.h b/script/api_param.h
index 033273758..58536e1e0 100644
--- a/script/api_param.h
+++ b/script/api_param.h
@@ -32,7 +32,7 @@ class scenario_t;
 class schedule_t;
 class settings_t;
 class simline_t;
-class spieler_t;
+class player_t;
 class stadt_t;
 class tool_t;
 class ware_production_t;
diff --git a/simcity.h b/simcity.h
index 2cd3aa4e1..b7577e7b0 100644
--- a/simcity.h
+++ b/simcity.h
@@ -395,7 +395,7 @@ private:
 	 *
 	 * @author Hj. Malthaner, V. Meyer
 	 */
-	bool build_road(const koord k, player_t *player, bool forced);
+	bool build_road(const koord k, player_t *player_, bool forced);
 
 	void build();
 
diff --git a/simconvoi.cc b/simconvoi.cc
index c90b88368..9c6fbc953 100644
--- a/simconvoi.cc
+++ b/simconvoi.cc
@@ -106,7 +106,7 @@ static int calc_min_top_speed(const array_tpl<vehicle_t*>& fahr, uint8 anz_vehik
 
 void convoi_t::init(player_t *player)
 {
-	owner_p = player;
+	owner = player;
 
 	is_electric = false;
 	sum_gesamtweight = sum_weight = 0;
@@ -174,11 +174,11 @@ convoi_t::convoi_t(loadsave_t* file) : fahr(default_vehicle_length, NULL)
 }
 
 
-convoi_t::convoi_t(player_t* player_) : fahr(default_vehicle_length, NULL)
+convoi_t::convoi_t(player_t* player) : fahr(default_vehicle_length, NULL)
 {
 	self = convoihandle_t(this);
-	player_->book_convoi_number(1);
-	init(player_);
+	player->book_convoi_number(1);
+	init(player);
 	set_name( "Unnamed" );
 	welt->add_convoi( self );
 	init_financial_history();
@@ -187,7 +187,7 @@ convoi_t::convoi_t(player_t* player_) : fahr(default_vehicle_length, NULL)
 
 convoi_t::~convoi_t()
 {
-	owner_p->book_convoi_number( -1);
+	owner->book_convoi_number( -1);
 
 	assert(self.is_bound());
 	assert(anz_vehikel==0);
@@ -360,7 +360,7 @@ void convoi_t::finish_rd()
 		}
 	}
 
-	bool realing_position = false;
+	bool realign_position = false;
 	if(  anz_vehikel>0  ) {
 DBG_MESSAGE("convoi_t::finish_rd()","state=%s, next_stop_index=%d", state_names[state], next_stop_index );
 		// only realign convois not leaving depot to avoid jumps through signals
@@ -390,10 +390,10 @@ DBG_MESSAGE("convoi_t::finish_rd()","state=%s, next_stop_index=%d", state_names[
 				// wrong alignment here => must relocate
 				if(v->need_realignment()) {
 					// diagonal => convoi must restart
-					realing_position |= ribi_t::is_bend(v->get_direction())  &&  (state==DRIVING  ||  is_waiting());
+					realign_position |= ribi_t::is_bend(v->get_direction())  &&  (state==DRIVING  ||  is_waiting());
 				}
 				// if version is 99.17 or lower, some convois are broken, i.e. had too large gaps between vehicles
-				if(  !realing_position  &&  state!=INITIAL  &&  state!=LEAVING_DEPOT  ) {
+				if(  !realign_position  &&  state!=INITIAL  &&  state!=LEAVING_DEPOT  ) {
 					if(  i==0  ) {
 						step_pos = v->get_steps();
 					}
@@ -410,7 +410,7 @@ DBG_MESSAGE("convoi_t::finish_rd()","state=%s, next_stop_index=%d", state_names[
 						dbg->message("convoi_t::finish_rd()", "v: pos(%s) steps(%d) len=%d ribi=%d prev (%s) step(%d)", v->get_pos().get_str(), v->get_steps(), v->get_desc()->get_length()*16, v->get_direction(),  drive_pos.get_2d().get_str(), step_pos);
 						if(  abs( v->get_steps() - step_pos )>15  ) {
 							// not where it should be => realign
-							realing_position = true;
+							realign_position = true;
 							dbg->warning( "convoi_t::finish_rd()", "convoi (%s) is broken => realign", get_name() );
 						}
 					}
@@ -458,14 +458,14 @@ DBG_MESSAGE("convoi_t::finish_rd()","next_stop_index=%d", next_stop_index );
 		return;
 	}
 	// put convoi again right on track?
-	if(realing_position  &&  anz_vehikel>1) {
+	if(realign_position  &&  anz_vehikel>1) {
 		// display just a warning
 		dbg->warning("convoi_t::finish_rd()","cnv %i is currently too long.",self.get_id());
 
 		if (route.empty()) {
 			// realigning needs a route
 			state = NO_ROUTE;
-			owner_p->report_vehicle_problem( self, koord3d::invalid );
+			owner->report_vehicle_problem( self, koord3d::invalid );
 			dbg->error( "convoi_t::finish_rd()", "No valid route, but needs realignment at (%s)!", fahr[0]->get_pos().get_str() );
 		}
 		else {
@@ -1196,7 +1196,7 @@ void convoi_t::step()
 				if(  schedule->empty()  ) {
 					// no entry => no route ...
 					state = NO_ROUTE;
-					owner_p->report_vehicle_problem( self, koord3d::invalid );
+					owner->report_vehicle_problem( self, koord3d::invalid );
 				}
 				else {
 					// Schedule changed at station
@@ -1242,7 +1242,7 @@ void convoi_t::step()
 
 				if(  schedule->empty()  ) {
 					state = NO_ROUTE;
-					owner_p->report_vehicle_problem( self, koord3d::invalid );
+					owner->report_vehicle_problem( self, koord3d::invalid );
 				}
 				else {
 					// check first, if we are already there:
@@ -1281,7 +1281,7 @@ void convoi_t::step()
 				if(  v->can_enter_tile( restart_speed, 0 )  ) {
 					// can reserve new block => drive on
 					state = (steps_driven>=0) ? LEAVING_DEPOT : DRIVING;
-					if(haltestelle_t::get_halt(v->get_pos(),owner_p).is_bound()) {
+					if(haltestelle_t::get_halt(v->get_pos(),owner).is_bound()) {
 						v->play_sound();
 					}
 				}
@@ -1528,7 +1528,7 @@ void convoi_t::start()
 		fahr[0]->set_image(IMG_EMPTY);
 
 		// update finances for used vehicle reduction when first driven
-		owner_p->update_assets( restwert_delta, get_schedule()->get_waytype());
+		owner->update_assets( restwert_delta, get_schedule()->get_waytype());
 
 		// calc state for convoi
 		calc_loading();
@@ -1579,7 +1579,7 @@ void convoi_t::ziel_erreicht()
 	}
 	else {
 		// no depot reached, check for stop!
-		halthandle_t halt = haltestelle_t::get_halt(schedule->get_current_entry().pos,owner_p);
+		halthandle_t halt = haltestelle_t::get_halt(schedule->get_current_entry().pos,owner);
 		if(  halt.is_bound() &&  gr->get_weg_ribi(v->get_waytype())!=0  ) {
 			// seems to be a stop, so book the money for the trip
 			akt_speed = 0;
@@ -2099,7 +2099,7 @@ void convoi_t::vorfahren()
 			sint32 restart_speed = -1;
 			if(  fahr[0]->can_enter_tile( restart_speed, 0 )  ) {
 				// can reserve new block => drive on
-				if(haltestelle_t::get_halt(k0,owner_p).is_bound()) {
+				if(haltestelle_t::get_halt(k0,owner).is_bound()) {
 					fahr[0]->play_sound();
 				}
 				state = DRIVING;
@@ -2147,7 +2147,7 @@ void convoi_t::rdwr(loadsave_t *file)
 	xml_tag_t t( file, "convoi_t" );
 
 	sint32 dummy;
-	sint32 owner_n = welt->sp2num(owner_p);
+	sint32 owner_n = welt->sp2num(owner);
 
 	if(file->is_saving()) {
 		if(  file->get_version()<101000  ) {
@@ -2217,7 +2217,7 @@ void convoi_t::rdwr(loadsave_t *file)
 		if(anz_vehikel > fahr.get_count()) {
 			fahr.resize(anz_vehikel, NULL);
 		}
-		owner_p = welt->get_player( owner_n );
+		owner = welt->get_player( owner_n );
 
 		// Hajo: sanity check for values ... plus correction
 		if(sp_soll < 0) {
@@ -2763,11 +2763,11 @@ void convoi_t::laden()
 	// just wait a little longer if this is a non-bound halt
 	wait_lock = (WTT_LOADING*2)+(self.get_id())%1024;
 
-	halthandle_t halt = haltestelle_t::get_halt(schedule->get_current_entry().pos,owner_p);
+	halthandle_t halt = haltestelle_t::get_halt(schedule->get_current_entry().pos,owner);
 	// eigene haltestelle ?
 	if(  halt.is_bound()  ) {
-		const player_t* owner = halt->get_owner();
-		if(  owner == get_owner()  ||  owner == welt->get_public_player()  ) {
+		const player_t* halt_owner = halt->get_owner();
+		if(  halt_owner == get_owner()  ||  halt_owner == welt->get_public_player()  ) {
 			// loading/unloading ...
 			halt->request_loading( self );
 		}
@@ -2788,7 +2788,7 @@ void convoi_t::calc_gewinn()
 		sint64 tmp;
 		gewinn += tmp = v->calc_revenue(v->last_stop_pos, v->get_pos() );
 		// get_schedule is needed as v->get_waytype() returns track_wt for trams (instead of tram_wt
-		owner_p->book_revenue(tmp, fahr[0]->get_pos().get_2d(), get_schedule()->get_waytype(), v->get_cargo_type()->get_index() );
+		owner->book_revenue(tmp, fahr[0]->get_pos().get_2d(), get_schedule()->get_waytype(), v->get_cargo_type()->get_index() );
 		v->last_stop_pos = v->get_pos();
 	}
 
@@ -2877,7 +2877,7 @@ station_tile_search_ready: ;
 		for(  uint8 i=1;  i<count;  i++  ) {
 			const uint8 wrap_i = (i + schedule->get_current_stop()) % count;
 
-			const halthandle_t plan_halt = haltestelle_t::get_halt(schedule->entries[wrap_i].pos, owner_p);
+			const halthandle_t plan_halt = haltestelle_t::get_halt(schedule->entries[wrap_i].pos, owner);
 			if(plan_halt == halt) {
 				// we will come later here again ...
 				break;
@@ -2912,7 +2912,7 @@ station_tile_search_ready: ;
 			sint64 tmp;
 			// calc_revenue
 			gewinn += tmp = v->calc_revenue(v->last_stop_pos, v->get_pos() );
-			owner_p->book_revenue(tmp, fahr[0]->get_pos().get_2d(), get_schedule()->get_waytype(), v->get_cargo_type()->get_index());
+			owner->book_revenue(tmp, fahr[0]->get_pos().get_2d(), get_schedule()->get_waytype(), v->get_cargo_type()->get_index());
 			v->last_stop_pos = v->get_pos();
 		}
 
@@ -3142,7 +3142,7 @@ void convoi_t::destroy()
 	}
 
 	// pay the current value
-	owner_p->book_new_vehicle( calc_restwert(), get_pos().get_2d(), fahr[0] ? fahr[0]->get_desc()->get_waytype() : ignore_wt );
+	owner->book_new_vehicle( calc_restwert(), get_pos().get_2d(), fahr[0] ? fahr[0]->get_desc()->get_waytype() : ignore_wt );
 
 	for(  uint8 i = anz_vehikel;  i-- != 0;  ) {
 		if(  !fahr[i]->get_flag( obj_t::not_on_map )  ) {
@@ -3156,10 +3156,10 @@ void convoi_t::destroy()
 			fahr[i]->set_flag( obj_t::not_on_map );
 
 		}
-		player_t::add_maintenance( owner_p, -fahr[i]->get_desc()->get_maintenance(), fahr[i]->get_desc()->get_waytype() );
+		player_t::add_maintenance( owner, -fahr[i]->get_desc()->get_maintenance(), fahr[i]->get_desc()->get_waytype() );
 
 		fahr[i]->discard_cargo();
-		fahr[i]->cleanup(owner_p);
+		fahr[i]->cleanup(owner);
 		delete fahr[i];
 	}
 	anz_vehikel = 0;
@@ -3191,7 +3191,7 @@ void convoi_t::dump() const
 		"schedule = '%p'",
 		(int)anz_vehikel,
 		(int)wait_lock,
-		(int)welt->sp2num(owner_p),
+		(int)welt->sp2num(owner),
 		(int)akt_speed,
 		(int)akt_speed_soll,
 		(int)sp_soll,
@@ -3303,8 +3303,8 @@ DBG_DEBUG("convoi_t::unset_line()", "removing old destinations from line=%d, sch
 // matches two halts; if the pos is not identical, maybe the halt still is the same
 bool convoi_t::matches_halt( const koord3d pos1, const koord3d pos2 )
 {
-	halthandle_t halt1 = haltestelle_t::get_halt(pos1, owner_p );
-	return pos1==pos2  ||  (halt1.is_bound()  &&  halt1==haltestelle_t::get_halt( pos2, owner_p ));
+	halthandle_t halt1 = haltestelle_t::get_halt(pos1, owner );
+	return pos1==pos2  ||  (halt1.is_bound()  &&  halt1==haltestelle_t::get_halt( pos2, owner ));
 }
 
 
diff --git a/simconvoi.h b/simconvoi.h
index bea03bf40..f8e01e390 100644
--- a/simconvoi.h
+++ b/simconvoi.h
@@ -146,7 +146,7 @@ private:
 	* Convoi owner
 	* @author Hj. Malthaner
 	*/
-	player_t *owner_p;
+	player_t *owner;
 
 	/**
 	* Current map
@@ -496,7 +496,7 @@ public:
 	*/
 	convoi_t(loadsave_t *file);
 
-	convoi_t(player_t* player_);
+	convoi_t(player_t* player);
 
 	virtual ~convoi_t();
 
@@ -691,7 +691,7 @@ public:
 	* @return Owner of this convoi
 	* @author Hj. Malthaner
 	*/
-	player_t * get_owner() const { return owner_p; }
+	player_t * get_owner() const { return owner; }
 
 	/**
 	* Opens an information window
diff --git a/simdepot.h b/simdepot.h
index cc6376ecf..d36327bdc 100644
--- a/simdepot.h
+++ b/simdepot.h
@@ -285,7 +285,7 @@ class tramdepot_t : public bahndepot_t
 {
 public:
 	tramdepot_t(loadsave_t *file):bahndepot_t(file) {}
-	tramdepot_t(koord3d pos,player_t *player_, const building_tile_desc_t *t): bahndepot_t(pos,player_,t) {}
+	tramdepot_t(koord3d pos,player_t *player, const building_tile_desc_t *t): bahndepot_t(pos,player,t) {}
 
 	simline_t::linetype get_line_type() const OVERRIDE { return simline_t::tramline; }
 
diff --git a/simhalt.cc b/simhalt.cc
index a2d7496d0..9c77b4fd3 100644
--- a/simhalt.cc
+++ b/simhalt.cc
@@ -428,7 +428,7 @@ haltestelle_t::haltestelle_t(loadsave_t* file)
 }
 
 
-haltestelle_t::haltestelle_t(koord k, player_t* player_)
+haltestelle_t::haltestelle_t(koord k, player_t* player)
 {
 	self = halthandle_t(this);
 	assert( !alle_haltestellen.is_contained(self) );
@@ -439,7 +439,7 @@ haltestelle_t::haltestelle_t(koord k, player_t* player_)
 	last_loading_step = welt->get_steps();
 
 	this->init_pos = k;
-	owner_p = player_;
+	owner = player;
 
 	enables = NOT_ENABLED;
 	// force total re-routing
@@ -964,10 +964,10 @@ bool haltestelle_t::step(uint8 what, sint16 &units_remaining)
  */
 void haltestelle_t::new_month()
 {
-	if(  welt->get_active_player()==owner_p  &&  status_color==color_idx_to_rgb(COL_RED)  ) {
+	if(  welt->get_active_player()==owner  &&  status_color==color_idx_to_rgb(COL_RED)  ) {
 		cbuffer_t buf;
 		buf.printf( translator::translate("%s\nis crowded."), get_name() );
-		welt->get_message()->add_message(buf, get_basis_pos(),message_t::full, PLAYER_FLAG|owner_p->get_player_nr(), IMG_EMPTY );
+		welt->get_message()->add_message(buf, get_basis_pos(),message_t::full, PLAYER_FLAG|owner->get_player_nr(), IMG_EMPTY );
 		enables &= (PAX|POST|WARE);
 	}
 
@@ -2294,7 +2294,7 @@ sint64 haltestelle_t::calc_maintenance() const
 void haltestelle_t::change_owner( player_t *player )
 {
 	// check if already public
-	if(  owner_p == player  ) {
+	if(  owner == player  ) {
 		return;
 	}
 
@@ -2368,7 +2368,7 @@ void haltestelle_t::change_owner( player_t *player )
 	}
 
 	// now finally change owner
-	owner_p = player;
+	owner = player;
 	rebuild_connections();
 	rebuild_linked_connections();
 
@@ -2388,7 +2388,7 @@ void haltestelle_t::merge_halt( halthandle_t halt_merged )
 		return;
 	}
 
-	halt_merged->change_owner( owner_p );
+	halt_merged->change_owner( owner );
 
 	// add statistics
 	for(  int month=0;  month<MAX_MONTHS;  month++  ) {
@@ -2622,7 +2622,7 @@ void haltestelle_t::rdwr(loadsave_t *file)
 	}
 
 	if(file->is_saving()) {
-		owner_n = welt->sp2num( owner_p );
+		owner_n = welt->sp2num( owner );
 	}
 
 	if(file->get_version()<99008) {
@@ -2638,7 +2638,7 @@ void haltestelle_t::rdwr(loadsave_t *file)
 	}
 
 	if(file->is_loading()) {
-		owner_p = welt->get_player(owner_n);
+		owner = welt->get_player(owner_n);
 		k.rdwr( file );
 		while(k!=koord3d::invalid) {
 			grund_t *gr = welt->lookup(k);
diff --git a/simhalt.h b/simhalt.h
index ebee770dd..273d2cb86 100644
--- a/simhalt.h
+++ b/simhalt.h
@@ -313,7 +313,7 @@ private:
 	 */
 	slist_tpl<fabrik_t *> fab_list;
 
-	player_t *owner_p;
+	player_t *owner;
 	static karte_ptr_t welt;
 
 	/**
@@ -422,7 +422,7 @@ public:
 
 	void rotate90( const sint16 y_size );
 
-	player_t *get_owner() const {return owner_p;}
+	player_t *get_owner() const {return owner;}
 
 	// just for info so far
 	sint64 calc_maintenance() const;
diff --git a/simlinemgmt.cc b/simlinemgmt.cc
index 9af0a73ba..d3d2025f0 100644
--- a/simlinemgmt.cc
+++ b/simlinemgmt.cc
@@ -187,13 +187,13 @@ void simlinemgmt_t::new_month()
 }
 
 
-linehandle_t simlinemgmt_t::create_line(int ltype, player_t * player_)
+linehandle_t simlinemgmt_t::create_line(int ltype, player_t * player)
 {
 	if(ltype < simline_t::truckline  ||  ltype > simline_t::narrowgaugeline) {
 			dbg->fatal( "simlinemgmt_t::create_line()", "Cannot create default line!" );
 	}
 
-	simline_t * line = new simline_t(player_, (simline_t::linetype)ltype);
+	simline_t * line = new simline_t(player, (simline_t::linetype)ltype);
 
 	add_line( line->get_handle() );
 	sort_lines();
@@ -201,9 +201,9 @@ linehandle_t simlinemgmt_t::create_line(int ltype, player_t * player_)
 }
 
 
-linehandle_t simlinemgmt_t::create_line(int ltype, player_t * player_, schedule_t * schedule)
+linehandle_t simlinemgmt_t::create_line(int ltype, player_t * player, schedule_t * schedule)
 {
-	linehandle_t line = create_line( ltype, player_ );
+	linehandle_t line = create_line( ltype, player );
 	if(schedule) {
 		line->get_schedule()->copy_from(schedule);
 	}
diff --git a/simlinemgmt.h b/simlinemgmt.h
index 9d2241a16..cf0f402a2 100644
--- a/simlinemgmt.h
+++ b/simlinemgmt.h
@@ -42,7 +42,7 @@ public:
 	/*
 	 * load or save the linemanagement
 	 */
-	void rdwr(loadsave_t * file, player_t * player_);
+	void rdwr(loadsave_t * file, player_t * player);
 
 	/*
 	 * sort the lines by name
@@ -67,13 +67,13 @@ public:
 	 * creates a line with an empty schedule
 	 * @author hsiegeln
 	 */
-	linehandle_t create_line(int ltype, player_t * player_);
+	linehandle_t create_line(int ltype, player_t * player);
 
 	/**
 	 * Creates a line and sets its schedule
 	 * @author prissi
 	 */
-	linehandle_t create_line(int ltype, player_t * player_, schedule_t * schedule);
+	linehandle_t create_line(int ltype, player_t * player, schedule_t * schedule);
 
 
 	/**
diff --git a/simmenu.cc b/simmenu.cc
index cc80883c6..914142049 100644
--- a/simmenu.cc
+++ b/simmenu.cc
@@ -1197,7 +1197,7 @@ void two_click_tool_t::cleanup( bool delete_start_marker )
 		koord3d pos = z->get_pos();
 		grund_t *gr = welt->lookup( pos );
 		delete z;
-		// Remove dummy ground (placed by tool_tunnelbau_t and tool_wegebau_t):
+		// Remove dummy ground (placed by tool_build_tunnel_t and tool_build_way_t):
 		if(gr  &&   (gr->get_typ() == grund_t::tunnelboden  ||  gr->get_typ() == grund_t::monorailboden)  &&  gr->get_weg_nr(0) == NULL && !gr->get_leitung() ) {
 			welt->access(pos.get_2d())->boden_entfernen(gr);
 			delete gr;
diff --git a/simmenu.h b/simmenu.h
index 64c9a7c3f..b996fac16 100644
--- a/simmenu.h
+++ b/simmenu.h
@@ -257,7 +257,7 @@ public:
 	void set_icon(image_id i) { icon = i; }
 
 	// returns default_param of this tool for player
-	// if sp==NULL returns default_param that was used to create the tool
+	// if player==NULL returns default_param that was used to create the tool
 	virtual const char* get_default_param(player_t* = NULL) const { return default_param; }
 	void set_default_param(const char* str) { default_param = str; }
 
@@ -446,7 +446,7 @@ public:
 	// close this toolbar
 	bool exit(player_t*) OVERRIDE;
 	virtual void update(player_t *);	// just refresh content
-	void append(tool_t *t) { tools.append(t); }
+	void append(tool_t *tool) { tools.append(tool); }
 };
 
 #define MAX_LAST_TOOLS (10)
diff --git a/simtool-dialogs.h b/simtool-dialogs.h
index 492dde1f9..84b686255 100644
--- a/simtool-dialogs.h
+++ b/simtool-dialogs.h
@@ -104,11 +104,11 @@ class dialog_lines_t : public tool_t {
 public:
 	dialog_lines_t() : tool_t(DIALOG_LINEOVERVIEW | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("Line Management"); }
-	image_id get_icon(player_t* player_) const OVERRIDE{ return player_->get_player_nr() == 1 ? IMG_EMPTY : icon; }
+	image_id get_icon(player_t* player) const OVERRIDE{ return player->get_player_nr() == 1 ? IMG_EMPTY : icon; }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_line_management_t + welt->get_active_player_nr()); }
-	bool init(player_t* player_) OVERRIDE{
-		if (player_->get_player_nr() != welt->get_public_player()->get_player_nr()) {
-			create_win(new schedule_list_gui_t(player_), w_info, magic_line_management_t + player_->get_player_nr());
+	bool init(player_t* player) OVERRIDE{
+		if (player->get_player_nr() != welt->get_public_player()->get_player_nr()) {
+			create_win(new schedule_list_gui_t(player), w_info, magic_line_management_t + player->get_player_nr());
 		}
 		return false;
 	}
@@ -138,8 +138,8 @@ public:
 	dialog_finances_t() : tool_t(DIALOG_FINANCES | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("Finanzen"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_finances_t + welt->get_active_player_nr()); }
-	bool init(player_t* player_) OVERRIDE{
-		create_win(new money_frame_t(player_), w_info, magic_finances_t + player_->get_player_nr());
+	bool init(player_t* player) OVERRIDE{
+		create_win(new money_frame_t(player), w_info, magic_finances_t + player->get_player_nr());
 		return false;
 	}
 	bool exit(player_t* const player) OVERRIDE{ destroy_win(magic_finances_t + player->get_player_nr()); return false; }
@@ -213,8 +213,8 @@ public:
 	dialog_playercolor_t() : tool_t(DIALOG_PLAYERCOLOR | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("Farbe"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_farbengui_t); }
-	bool init(player_t* player_) OVERRIDE{
-		create_win(new farbengui_t(player_), w_info, magic_farbengui_t);
+	bool init(player_t* player) OVERRIDE{
+		create_win(new farbengui_t(player), w_info, magic_farbengui_t);
 		return false;
 	}
 	bool exit(player_t*) OVERRIDE{ destroy_win(magic_farbengui_t); return false; }
@@ -318,8 +318,8 @@ public:
 	dialog_list_halt_t() : tool_t(DIALOG_LIST_HALT | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("hl_title"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_halt_list_t); }
-	bool init(player_t* player_) OVERRIDE{
-		create_win(new halt_list_frame_t(player_), w_info, magic_halt_list_t);
+	bool init(player_t* player) OVERRIDE{
+		create_win(new halt_list_frame_t(player), w_info, magic_halt_list_t);
 		return false;
 	}
 	bool exit(player_t*) OVERRIDE{ destroy_win(magic_halt_list_t); return false; }
@@ -333,8 +333,8 @@ public:
 	dialog_list_convoi_t() : tool_t(DIALOG_LIST_CONVOI | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("cl_title"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_convoi_list + welt->get_active_player_nr()); }
-	bool init(player_t* player_) OVERRIDE{
-		create_win(new convoi_frame_t(player_), w_info, magic_convoi_list + player_->get_player_nr());
+	bool init(player_t* player) OVERRIDE{
+		create_win(new convoi_frame_t(player), w_info, magic_convoi_list + player->get_player_nr());
 		return false;
 	}
 	bool exit(player_t* const player) OVERRIDE{ destroy_win(magic_convoi_list + player->get_player_nr()); return false; }
@@ -408,9 +408,9 @@ public:
 	dialog_edit_factory_t() : tool_t(DIALOG_EDIT_FACTORY | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("factorybuilder"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_edit_factory); }
-	bool init(player_t* player_) OVERRIDE{
+	bool init(player_t* player) OVERRIDE{
 		if (!is_selected()) {
-			create_win(new factory_edit_frame_t(player_), w_info, magic_edit_factory);
+			create_win(new factory_edit_frame_t(player), w_info, magic_edit_factory);
 		}
 		return false;
 	}
@@ -425,9 +425,9 @@ public:
 	dialog_edit_attraction_t() : tool_t(DIALOG_EDIT_ATTRACTION | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("curiosity builder"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_edit_attraction); }
-	bool init(player_t* player_) OVERRIDE{
+	bool init(player_t* player) OVERRIDE{
 		if (!is_selected()) {
-			create_win(new curiosity_edit_frame_t(player_), w_info, magic_edit_attraction);
+			create_win(new curiosity_edit_frame_t(player), w_info, magic_edit_attraction);
 		}
 		return false;
 	}
@@ -442,9 +442,9 @@ public:
 	dialog_edit_house_t() : tool_t(DIALOG_EDIT_HOUSE | DIALOGE_TOOL) {}
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("citybuilding builder"); }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_edit_house); }
-	bool init(player_t* player_) OVERRIDE{
+	bool init(player_t* player) OVERRIDE{
 		if (!is_selected()) {
-			create_win(new citybuilding_edit_frame_t(player_), w_info, magic_edit_house);
+			create_win(new citybuilding_edit_frame_t(player), w_info, magic_edit_house);
 		}
 		return false;
 	}
@@ -460,9 +460,9 @@ public:
 	char const* get_tooltip(player_t const*) const OVERRIDE{ return translator::translate("baum builder"); }
 	image_id get_icon(player_t *) const OVERRIDE { return baum_t::get_count() > 0 ? icon : IMG_EMPTY; }
 	bool is_selected() const OVERRIDE{ return win_get_magic(magic_edit_tree); }
-	bool init(player_t* player_) OVERRIDE{
+	bool init(player_t* player) OVERRIDE{
 		if (baum_t::get_count() > 0 && !is_selected()) {
-			create_win(new baum_edit_frame_t(player_), w_info, magic_edit_tree);
+			create_win(new baum_edit_frame_t(player), w_info, magic_edit_tree);
 		}
 		return false;
 	}
diff --git a/simtool.cc b/simtool.cc
index b181cf9fc..96283dbd5 100644
--- a/simtool.cc
+++ b/simtool.cc
@@ -3499,7 +3499,7 @@ const char *tool_build_station_t::tool_station_building_aux(player_t *player, bo
 	}
 DBG_MESSAGE("tool_station_building_aux()", "building mail office/station building on square %d,%d", k.x, k.y);
 
-	// Player pays for the construction
+	// Player player pays for the construction
 	// but we try to extend stations of Player new_owner that may be the public player
 	player_t *new_owner = extend_public_halt ? welt->get_public_player() : player;
 
@@ -4612,7 +4612,7 @@ const char *tool_build_station_t::work( player_t *player, koord3d pos )
 		}
 
 		default:
-			dbg->warning("tool_station_t::work()","tool called for illegal desc \"%\"", default_param );
+			dbg->warning("tool_build_station_t::work()","tool called for illegal desc \"%\"", default_param );
 			msg = "Illegal station tool";
 	}
 	return msg;
@@ -5290,7 +5290,7 @@ const char *tool_build_depot_t::work( player_t *player, koord3d pos )
 		case tram_wt:
 			return tool_build_depot_t::tool_depot_aux(player, pos, desc, track_wt);
 		default:
-			dbg->warning("tool_depot()","called with unknown desc %s",desc->get_name() );
+			dbg->warning("tool_build_depot()","called with unknown desc %s",desc->get_name() );
 			return "Unknown depot object";
 	}
 	return NULL;
diff --git a/vehicle/simvehicle.cc b/vehicle/simvehicle.cc
index 49d1dc6e4..98e6df017 100644
--- a/vehicle/simvehicle.cc
+++ b/vehicle/simvehicle.cc
@@ -931,12 +931,12 @@ void vehicle_t::initialise_journey(uint16 start_route_index, bool recalc)
 }
 
 
-vehicle_t::vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_) :
+vehicle_t::vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player) :
 	vehicle_base_t(pos)
 {
 	this->desc = desc;
 
-	set_owner( player_ );
+	set_owner( player );
 	purchase_time = welt->get_current_month();
 	cnv = NULL;
 	speed_limit = SPEED_UNLIMITED;
@@ -1803,8 +1803,8 @@ void vehicle_t::display_after(int xpos, int ypos, bool is_gobal) const
 
 
 
-road_vehicle_t::road_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cn) :
-	vehicle_t(pos, desc, player_)
+road_vehicle_t::road_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cn) :
+	vehicle_t(pos, desc, player)
 {
 	cnv = cn;
 }
@@ -2386,8 +2386,8 @@ DBG_MESSAGE("rail_vehicle_t::rail_vehicle_t()","replaced by %s",desc->get_name()
 }
 
 
-rail_vehicle_t::rail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cn) :
-	vehicle_t(pos, desc, player_)
+rail_vehicle_t::rail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cn) :
+	vehicle_t(pos, desc, player)
 {
     cnv = cn;
 }
@@ -3193,8 +3193,8 @@ schedule_t * narrowgauge_vehicle_t::generate_new_schedule() const
 }
 
 
-water_vehicle_t::water_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cn) :
-	vehicle_t(pos, desc, player_)
+water_vehicle_t::water_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cn) :
+	vehicle_t(pos, desc, player)
 {
 	cnv = cn;
 }
@@ -4017,8 +4017,8 @@ air_vehicle_t::air_vehicle_t(loadsave_t *file, bool is_first, bool is_last) : ve
 }
 
 
-air_vehicle_t::air_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cn) :
-	vehicle_t(pos, desc, player_)
+air_vehicle_t::air_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cn) :
+	vehicle_t(pos, desc, player)
 {
 	cnv = cn;
 	state = taxiing;
diff --git a/vehicle/simvehicle.h b/vehicle/simvehicle.h
index 7b1a03555..ef4a4058d 100644
--- a/vehicle/simvehicle.h
+++ b/vehicle/simvehicle.h
@@ -341,7 +341,7 @@ public:
 	void initialise_journey( uint16 start_route_index, bool recalc );
 
 	vehicle_t();
-	vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_);
+	vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player);
 
 	~vehicle_t();
 
@@ -506,7 +506,7 @@ public:
 	waytype_t get_waytype() const OVERRIDE { return road_wt; }
 
 	road_vehicle_t(loadsave_t *file, bool first, bool last);
-	road_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv); // start and schedule
+	road_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv); // start and schedule
 
 	void set_convoi(convoi_t *c) OVERRIDE;
 
@@ -579,7 +579,7 @@ public:
 	typ get_typ() const OVERRIDE { return rail_vehicle; }
 
 	rail_vehicle_t(loadsave_t *file, bool is_first, bool is_last);
-	rail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t *cnv);
+	rail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t *cnv);
 	~rail_vehicle_t();
 
 	void set_convoi(convoi_t *c) OVERRIDE;
@@ -601,7 +601,7 @@ public:
 
 	// all handled by rail_vehicle_t
 	monorail_vehicle_t(loadsave_t *file, bool is_first, bool is_last) : rail_vehicle_t(file,is_first, is_last) {}
-	monorail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv) : rail_vehicle_t(pos, desc, player_, cnv) {}
+	monorail_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv) : rail_vehicle_t(pos, desc, player, cnv) {}
 
 	typ get_typ() const OVERRIDE { return monorail_vehicle; }
 
@@ -622,7 +622,7 @@ public:
 
 	// all handled by rail_vehicle_t
 	maglev_vehicle_t(loadsave_t *file, bool is_first, bool is_last) : rail_vehicle_t(file, is_first, is_last) {}
-	maglev_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv) : rail_vehicle_t(pos, desc, player_, cnv) {}
+	maglev_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv) : rail_vehicle_t(pos, desc, player, cnv) {}
 
 	typ get_typ() const OVERRIDE { return maglev_vehicle; }
 
@@ -643,7 +643,7 @@ public:
 
 	// all handled by rail_vehicle_t
 	narrowgauge_vehicle_t(loadsave_t *file, bool is_first, bool is_last) : rail_vehicle_t(file, is_first, is_last) {}
-	narrowgauge_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv) : rail_vehicle_t(pos, desc, player_, cnv) {}
+	narrowgauge_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv) : rail_vehicle_t(pos, desc, player, cnv) {}
 
 	typ get_typ() const OVERRIDE { return narrowgauge_vehicle; }
 
@@ -680,7 +680,7 @@ public:
 	bool is_target(const grund_t *,const grund_t *) const OVERRIDE {return 0;}
 
 	water_vehicle_t(loadsave_t *file, bool is_first, bool is_last);
-	water_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv);
+	water_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv);
 
 	obj_t::typ get_typ() const OVERRIDE { return water_vehicle; }
 
@@ -731,7 +731,7 @@ protected:
 
 public:
 	air_vehicle_t(loadsave_t *file, bool is_first, bool is_last);
-	air_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player_, convoi_t* cnv); // start and schedule
+	air_vehicle_t(koord3d pos, const vehicle_desc_t* desc, player_t* player, convoi_t* cnv); // start and schedule
 
 	// to shift the events around properly
 	void get_event_index( flight_state &state_, uint32 &takeoff_, uint32 &stopsearch_, uint32 &landing_ ) { state_ = state; takeoff_ = takeoff; stopsearch_ = searchforstop; landing_ = touchdown; }