diff --git a/gui/ai_option_t.cc b/gui/ai_option_t.cc
index e133af34c..9402592e9 100644
--- a/gui/ai_option_t.cc
+++ b/gui/ai_option_t.cc
@@ -115,24 +115,24 @@ ai_option_t::ai_option_t( player_t *player ) :
 }
 
 
-bool ai_option_t::action_triggered( gui_action_creator_t *komp, value_t v )
+bool ai_option_t::action_triggered( gui_action_creator_t *comp, value_t v )
 {
-	if(  komp==&construction_speed  ) {
+	if(  comp==&construction_speed  ) {
 		ai->set_construction_speed( v.i );
 	}
-	else if(  komp==buttons+0  ) {
+	else if(  comp==buttons+0  ) {
 		ai->set_road_transport( !buttons[0].pressed );
 		buttons[0].pressed = ai->has_road_transport();
 	}
-	else if(  komp==buttons+1  ) {
+	else if(  comp==buttons+1  ) {
 		ai->set_rail_transport( !buttons[1].pressed );
 		buttons[1].pressed = ai->has_rail_transport();
 	}
-	else if(  komp==buttons+2  ) {
+	else if(  comp==buttons+2  ) {
 		ai->set_ship_transport( !buttons[2].pressed );
 		buttons[2].pressed = ai->has_ship_transport();
 	}
-	else if(  komp==buttons+3  ) {
+	else if(  comp==buttons+3  ) {
 		ai->set_air_transport( !buttons[3].pressed );
 		buttons[3].pressed = ai->has_air_transport();
 	}
diff --git a/gui/banner.cc b/gui/banner.cc
index 2b611742b..15663f490 100644
--- a/gui/banner.cc
+++ b/gui/banner.cc
@@ -128,24 +128,24 @@ bool banner_t::infowin_event(const event_t *ev)
 }
 
 
-bool banner_t::action_triggered( gui_action_creator_t *komp, value_t)
+bool banner_t::action_triggered( gui_action_creator_t *comp, value_t)
 {
-	if(  komp == &quit  ) {
+	if(  comp == &quit  ) {
 		env_t::quit_simutrans = true;
 		destroy_all_win(true);
 	}
-	else if(  komp == &new_map  ) {
+	else if(  comp == &new_map  ) {
 		destroy_all_win(true);
 	}
-	else if(  komp == &load_map  ) {
+	else if(  comp == &load_map  ) {
 		destroy_all_win(true);
 		create_win( new loadsave_frame_t(true), w_info, magic_load_t);
 	}
-	else if(  komp == &load_scenario  ) {
+	else if(  comp == &load_scenario  ) {
 		destroy_all_win(true);
 		create_win( new scenario_frame_t(), w_info, magic_load_t );
 	}
-	else if(  komp == &join_map  ) {
+	else if(  comp == &join_map  ) {
 		destroy_all_win(true);
 		create_win( new server_frame_t(), w_info, magic_server_frame_t );
 	}
diff --git a/gui/city_info.cc b/gui/city_info.cc
index 6fb81e09b..5b08a56fa 100644
--- a/gui/city_info.cc
+++ b/gui/city_info.cc
@@ -338,22 +338,22 @@ void city_info_t::draw(scr_coord pos, scr_size size)
 }
 
 
-bool city_info_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool city_info_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
 	static char param[16];
-	if(  komp==&allow_growth  ) {
+	if(  comp==&allow_growth  ) {
 		sprintf(param,"g%hi,%hi,%hi", city->get_pos().x, city->get_pos().y, (short)(!city->get_citygrowth()) );
 		tool_t::simple_tool[TOOL_CHANGE_CITY]->set_default_param( param );
 		welt->set_tool( tool_t::simple_tool[TOOL_CHANGE_CITY], welt->get_public_player());
 		return true;
 	}
-	if(  komp==&name_input  ) {
+	if(  comp==&name_input  ) {
 		// send rename command if necessary
 		rename_city();
 	}
 	else {
 		for(  int i=0;  i<MAX_CITY_HISTORY;  i++  ) {
-			if(  komp == &filterButtons[i]  ) {
+			if(  comp == &filterButtons[i]  ) {
 				filterButtons[i].pressed ^= 1;
 				if(  filterButtons[i].pressed  ) {
 					city->stadtinfo_options |= (1<<i);
diff --git a/gui/citybuilding_edit.cc b/gui/citybuilding_edit.cc
index 50db66ae1..7687c09ca 100644
--- a/gui/citybuilding_edit.cc
+++ b/gui/citybuilding_edit.cc
@@ -175,23 +175,23 @@ void citybuilding_edit_frame_t::fill_list( bool translate )
 
 
 
-bool citybuilding_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_t e)
+bool citybuilding_edit_frame_t::action_triggered( gui_action_creator_t *comp,value_t e)
 {
 	// only one chain can be shown
-	if(  komp==&bt_res  ) {
+	if(  comp==&bt_res  ) {
 		bt_res.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_com  ) {
+	else if(  comp==&bt_com  ) {
 		bt_com.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_ind  ) {
+	else if(  comp==&bt_ind  ) {
 		bt_ind.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
 	else if(desc) {
-		if(  komp==&bt_left_rotate  ) {
+		if(  comp==&bt_left_rotate  ) {
 			// random, auto, max_rotaions-1 ... 0
 			if(rotation==254) {
 				rotation = desc->get_all_layouts()-1;
@@ -200,7 +200,7 @@ bool citybuilding_edit_frame_t::action_triggered( gui_action_creator_t *komp,val
 				rotation --;
 			}
 		}
-		else if(  komp==&bt_right_rotate  ) {
+		else if(  comp==&bt_right_rotate  ) {
 			// 0...max-rotation, auto, random
 			if(  rotation==desc->get_all_layouts()-1  ) {
 				rotation = 254;
@@ -212,7 +212,7 @@ bool citybuilding_edit_frame_t::action_triggered( gui_action_creator_t *komp,val
 		// update info ...
 		change_item_info( scl.get_selection() );
 	}
-	return extend_edit_gui_t::action_triggered(komp,e);
+	return extend_edit_gui_t::action_triggered(comp,e);
 }
 
 
diff --git a/gui/citylist_frame_t.cc b/gui/citylist_frame_t.cc
index 6e9f267ee..0510dbb62 100644
--- a/gui/citylist_frame_t.cc
+++ b/gui/citylist_frame_t.cc
@@ -155,22 +155,22 @@ citylist_frame_t::citylist_frame_t() :
 }
 
 
-bool citylist_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool citylist_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &sortedby) {
+	if(comp == &sortedby) {
 		int i = citylist_stats_t::sort_mode & ~citylist_stats_t::SORT_REVERSE;
 		i = (i + 1) % citylist_stats_t::SORT_MODES;
 		sortedby.set_text(sort_text[i]);
 		citylist_stats_t::sort_mode = (citylist_stats_t::sort_mode_t)(i | (citylist_stats_t::sort_mode & citylist_stats_t::SORT_REVERSE));
 		scrolly.sort(0,NULL);
 	}
-	else if(komp == &sorteddir) {
+	else if(comp == &sorteddir) {
 		bool reverse = citylist_stats_t::sort_mode <= citylist_stats_t::SORT_MODES;
 		sorteddir.set_text(reverse ? "hl_btn_sort_desc" : "hl_btn_sort_asc");
 		citylist_stats_t::sort_mode = (citylist_stats_t::sort_mode_t)((citylist_stats_t::sort_mode & ~citylist_stats_t::SORT_REVERSE) + (reverse*citylist_stats_t::SORT_REVERSE) );
 		scrolly.sort(0,NULL);
 	}
-	else if(komp == &show_stats) {
+	else if(comp == &show_stats) {
 		show_stats.pressed = !show_stats.pressed;
 		chart.set_visible( show_stats.pressed );
 		year_month_tabs.set_visible( show_stats.pressed );
@@ -182,7 +182,7 @@ bool citylist_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* *
 	}
 	else {
 		for(  int i=0;  i<karte_t::MAX_WORLD_COST;  i++ ) {
-			if(  komp == filterButtons+i  ) {
+			if(  comp == filterButtons+i  ) {
 				filterButtons[i].pressed = !filterButtons[i].pressed;
 				if (filterButtons[i].pressed) {
 					chart.show_curve(i);
diff --git a/gui/climates.cc b/gui/climates.cc
index bdb6738bb..c5a96db74 100644
--- a/gui/climates.cc
+++ b/gui/climates.cc
@@ -188,18 +188,18 @@ climate_gui_t::climate_gui_t(settings_t* const sets_par) :
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool climate_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
+bool climate_gui_t::action_triggered( gui_action_creator_t *comp, value_t v)
 {
 	welt_gui_t *welt_gui = dynamic_cast<welt_gui_t *>(win_get_magic( magic_welt_gui_t ));
-	if(komp==&no_tree) {
+	if(comp==&no_tree) {
 		no_tree.pressed ^= 1;
 		sets->set_no_trees(no_tree.pressed);
 	}
-	else if(komp==&lake) {
+	else if(comp==&lake) {
 		lake.pressed ^= 1;
 		sets->set_lake(lake.pressed);
 	}
-	else if(komp==&water_level) {
+	else if(comp==&water_level) {
 		sets->groundwater = (sint16)v.i;
 
 		// Update borders if necessary
@@ -212,32 +212,32 @@ bool climate_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 			welt_gui->update_preview();
 		}
 	}
-	else if(komp==&mountain_height) {
+	else if(comp==&mountain_height) {
 		sets->max_mountain_height = v.i;
 		mountain_roughness.set_limits(0,min(10,11-((v.i+99)/100)));
 		if(  welt_gui  ) {
 			welt_gui->update_preview();
 		}
 	}
-	else if(komp==&mountain_roughness) {
+	else if(comp==&mountain_roughness) {
 		sets->map_roughness = (double)(v.i+8)/20.0;
 		mountain_height.set_limits(0,min(1000,100*(11-v.i)));
 		if(  welt_gui  ) {
 			welt_gui->update_preview();
 		}
 	}
-	else if(komp==&river_n) {
+	else if(comp==&river_n) {
 		sets->river_number = (sint16)v.i;
 	}
-	else if(komp==&river_min) {
+	else if(comp==&river_min) {
 		sets->min_river_length = (sint16)v.i;
 		river_max.set_limits(v.i+16,1024);
 	}
-	else if(komp==&river_max) {
+	else if(comp==&river_max) {
 		sets->max_river_length = (sint16)v.i;
 		river_min.set_limits(0,max(16,v.i)-16);
 	}
-	else if(komp==&snowline_winter) {
+	else if(comp==&snowline_winter) {
 		sets->winter_snowline = (sint16)v.i;
 	}
 
@@ -245,7 +245,7 @@ bool climate_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	// Arctic starts at maximum end of climate
 	sint16 arctic = 0;
 	for(  int i=desert_climate;  i<=rocky_climate;  i++  ) {
-		if(  komp==climate_borders_ui+i-1  ) {
+		if(  comp==climate_borders_ui+i-1  ) {
 			sets->climate_borders[i] = (sint16)v.i;
 		}
 
diff --git a/gui/convoi_detail_t.cc b/gui/convoi_detail_t.cc
index 06cd8baa6..579f1a7ca 100644
--- a/gui/convoi_detail_t.cc
+++ b/gui/convoi_detail_t.cc
@@ -129,14 +129,14 @@ void convoi_detail_t::draw(scr_coord pos, scr_size size)
  * This method is called if an action is triggered
  * @author Markus Weber
  */
-bool convoi_detail_t::action_triggered(gui_action_creator_t *komp,value_t /* */)           // 28-Dec-01    Markus Weber    Added
+bool convoi_detail_t::action_triggered(gui_action_creator_t *comp,value_t /* */)           // 28-Dec-01    Markus Weber    Added
 {
 	if(cnv.is_bound()) {
-		if(komp==&sale_button) {
+		if(comp==&sale_button) {
 			cnv->call_convoi_tool( 'x', NULL );
 			return true;
 		}
-		else if(komp==&withdraw_button) {
+		else if(comp==&withdraw_button) {
 			cnv->call_convoi_tool( 'w', NULL );
 			return true;
 		}
diff --git a/gui/convoi_filter_frame.cc b/gui/convoi_filter_frame.cc
index b525d2a63..5594dafca 100644
--- a/gui/convoi_filter_frame.cc
+++ b/gui/convoi_filter_frame.cc
@@ -176,38 +176,38 @@ convoi_filter_frame_t::convoi_filter_frame_t(player_t *player, convoi_frame_t *m
  * This method is called if an action is triggered
  * @author V. Meyer
  */
-bool convoi_filter_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool convoi_filter_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
 	for( int i = 0; i < FILTER_BUTTONS; i++) {
-		if(komp == filter_buttons + i) {
+		if(comp == filter_buttons + i) {
 			filter_buttons[i].pressed ^= 1;
 			set_filter( filter_buttons_types[i], !get_filter(filter_buttons_types[i]) );
 			sort_list();
 			return true;
 		}
 	}
-	if(komp == &ware_alle) {
+	if(comp == &ware_alle) {
 		FOR( slist_tpl<ware_item_t *>, wi, all_ware ) {
 			wi->pressed = true;
 		}
 		sort_list();
 		return true;
 	}
-	if(komp == &ware_keine) {
+	if(comp == &ware_keine) {
 		FOR( slist_tpl<ware_item_t *>, wi, all_ware ) {
 			wi->pressed = false;
 		}
 		sort_list();
 		return true;
 	}
-	if(  komp == &ware_invers  ) {
+	if(  comp == &ware_invers  ) {
 		FOR( slist_tpl<ware_item_t *>, wi, all_ware ) {
 			wi->pressed ^= true;
 		}
 		sort_list();
 		return true;
 	}
-	if(  komp == &name_filter_input  &&  filter_flags&name_filter  ) {
+	if(  comp == &name_filter_input  &&  filter_flags&name_filter  ) {
 		sort_list();
 		return true;
 	}
diff --git a/gui/curiosity_edit.cc b/gui/curiosity_edit.cc
index b2210304f..7fb57bd89 100644
--- a/gui/curiosity_edit.cc
+++ b/gui/curiosity_edit.cc
@@ -163,23 +163,23 @@ void curiosity_edit_frame_t::fill_list( bool translate )
 
 
 
-bool curiosity_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_t e)
+bool curiosity_edit_frame_t::action_triggered( gui_action_creator_t *comp,value_t e)
 {
 	// only one chain can be shown
-	if(  komp==&bt_city_attraction  ) {
+	if(  comp==&bt_city_attraction  ) {
 		bt_city_attraction.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_land_attraction  ) {
+	else if(  comp==&bt_land_attraction  ) {
 		bt_land_attraction.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_monuments  ) {
+	else if(  comp==&bt_monuments  ) {
 		bt_monuments.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
 	else if(desc) {
-		if(  komp==&bt_left_rotate  &&  rotation!=255) {
+		if(  comp==&bt_left_rotate  &&  rotation!=255) {
 			if(rotation==0) {
 				rotation = 255;
 			}
@@ -187,13 +187,13 @@ bool curiosity_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_
 				rotation --;
 			}
 		}
-		else if(  komp==&bt_right_rotate  &&  rotation!=desc->get_all_layouts()-1) {
+		else if(  comp==&bt_right_rotate  &&  rotation!=desc->get_all_layouts()-1) {
 			rotation ++;
 		}
 		// update info ...
 		change_item_info( scl.get_selection() );
 	}
-	return extend_edit_gui_t::action_triggered(komp,e);
+	return extend_edit_gui_t::action_triggered(comp,e);
 }
 
 
diff --git a/gui/curiositylist_frame_t.cc b/gui/curiositylist_frame_t.cc
index 139f6d7ff..c78f7fcd3 100644
--- a/gui/curiositylist_frame_t.cc
+++ b/gui/curiositylist_frame_t.cc
@@ -76,13 +76,13 @@ curiositylist_frame_t::curiositylist_frame_t() :
  * This method is called if an action is triggered
  * @author Markus Weber/Volker Meyer
  */
-bool curiositylist_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool curiositylist_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &sortedby) {
+	if(comp == &sortedby) {
 		set_sortierung((curiositylist::sort_mode_t)((get_sortierung() + 1) % curiositylist::SORT_MODES));
 		display_list();
 	}
-	else if(komp == &sorteddir) {
+	else if(comp == &sorteddir) {
 		set_reverse(!get_reverse());
 		display_list();
 	}
diff --git a/gui/display_settings.cc b/gui/display_settings.cc
index 7bd7fba25..9be4a6bba 100644
--- a/gui/display_settings.cc
+++ b/gui/display_settings.cc
@@ -414,16 +414,16 @@ void color_gui_t::set_windowsize(scr_size size)
 }
 
 
-bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
+bool color_gui_t::action_triggered( gui_action_creator_t *comp, value_t v)
 {
 
 	// Brightness edit
-	if(&brightness==komp) {
+	if(&brightness==comp) {
 	  env_t::daynight_level = (sint8)v.i;
 	} else
 
 	// Traffic density edit
-	if(&traffic_density==komp) {
+	if(&traffic_density==comp) {
 		if(  !env_t::networkmode  ||  welt->get_active_player_nr()==1  ) {
 			static char level[16];
 			sprintf(level, "%li", v.i);
@@ -436,87 +436,87 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	} else
 
 	// Scroll speed edit
-	if(&scrollspeed==komp) {
+	if(&scrollspeed==comp) {
 		env_t::scroll_multi = (sint16)( buttons[6].pressed ? -v.i : v.i );
 	} else
 
 	// Smart hide objects edit
-	if(&cursor_hide_range==komp) {
+	if(&cursor_hide_range==comp) {
 		env_t::cursor_hide_range = cursor_hide_range.get_value();
 	} else
 
 	// Convoy tooltip left arrows
-	if((buttons+0)==komp) {
+	if((buttons+0)==comp) {
 		env_t::show_vehicle_states = (env_t::show_vehicle_states+2)%3;
 	} else
 
 	// Convoy tooltip right arrow
-	if((buttons+1)==komp) {
+	if((buttons+1)==comp) {
 		env_t::show_vehicle_states = (env_t::show_vehicle_states+1)%3;
 	} else
 
 	// Scroll inverse checkbox
-	if((buttons+6)==komp) {
+	if((buttons+6)==comp) {
 		buttons[6].pressed ^= 1;
 		env_t::scroll_multi = -env_t::scroll_multi;
 	} else
 
 	// Pedestrians at stops checkbox
-	if((buttons+7)==komp) {
+	if((buttons+7)==comp) {
 		if(  !env_t::networkmode  ||  welt->get_active_player_nr()==1  ) {
 			welt->set_tool( tool_t::simple_tool[TOOL_TOOGLE_PAX&0xFFF], welt->get_active_player() );
 		}
 	} else
 
 	// Pedestrians in towns checkbox
-	if((buttons+8)==komp) {
+	if((buttons+8)==comp) {
 		if(  !env_t::networkmode  ||  welt->get_active_player_nr()==1  ) {
 			welt->set_tool( tool_t::simple_tool[TOOL_TOOGLE_PEDESTRIANS&0xFFF], welt->get_active_player() );
 		}
 	} else
 
 	// Day/night change checkbox
-	if((buttons+9)==komp) {
+	if((buttons+9)==comp) {
 		env_t::night_shift = !env_t::night_shift;
 		buttons[9].pressed ^= 1;
 	} else
 
 	// Transparent instead of hidden checkbox
-	if((buttons+10)==komp) {
+	if((buttons+10)==comp) {
 		env_t::hide_with_transparency = !env_t::hide_with_transparency;
 		buttons[10].pressed ^= 1;
 		baum_t::recalc_outline_color();
 	} else
 
 	// Hide trees checkbox
-	if((buttons+11)==komp) {
+	if((buttons+11)==comp) {
 		env_t::hide_trees = !env_t::hide_trees;
 		baum_t::recalc_outline_color();
 	} else
 
 	// Hide buildings left arrows
-	if((buttons+12)==komp) {
+	if((buttons+12)==comp) {
 		env_t::hide_buildings = (env_t::hide_buildings+2)%3;
 	} else
 
 	// Hide buildings right arrows
-	if((buttons+13)==komp) {
+	if((buttons+13)==comp) {
 		env_t::hide_buildings = (env_t::hide_buildings+1)%3;
 	} else
 
 	// Transparent station coverage
-	if((buttons+14)==komp) {
+	if((buttons+14)==comp) {
 		env_t::use_transparency_station_coverage = !env_t::use_transparency_station_coverage;
 		buttons[14].pressed ^= 1;
 	} else
 
 	// Show station coverage
-	if((buttons+15)==komp) {
+	if((buttons+15)==comp) {
 		env_t::station_coverage_show = env_t::station_coverage_show==0 ? 0xFF : 0;
 	} else
 
 	// Underground view checkbox
-	if((buttons+16)==komp) {
+	if((buttons+16)==comp) {
 
 		// see simtool.cc::tool_show_underground_t::init
 		grund_t::set_underground_mode(buttons[16].pressed ? grund_t::ugm_none : grund_t::ugm_all, inp_underground_level.get_value());
@@ -530,12 +530,12 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	} else
 
 	// Show grid checkbox
-	if((buttons+17)==komp) {
+	if((buttons+17)==comp) {
 		grund_t::toggle_grid();
 	} else
 
 	// Show station names arrow
-	if((buttons+18)==komp) {
+	if((buttons+18)==comp) {
 		if(  env_t::show_names&1  ) {
 			if(  (env_t::show_names>>2) == 2  ) {
 				env_t::show_names &= 2;
@@ -551,12 +551,12 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	} else
 
 	// Show waiting bars checkbox
-	if((buttons+19)==komp) {
+	if((buttons+19)==comp) {
 		env_t::show_names ^= 2;
 	} else
 
 	// Show slice map view checkbox
-	if((buttons+20)==komp) {
+	if((buttons+20)==comp) {
 
 		// see simtool.cc::tool_show_underground_t::init
 		grund_t::set_underground_mode(buttons[20].pressed ? grund_t::ugm_none : grund_t::ugm_level, inp_underground_level.get_value());
@@ -570,7 +570,7 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	} else
 
 	// Hide buildings and trees under mouse cursor checkbox
-	if((buttons+21)==komp) {
+	if((buttons+21)==comp) {
 
 		// see simtool.cc::tool_hide_under_cursor_t::init
 		env_t::hide_under_cursor = !env_t::hide_under_cursor  &&  env_t::cursor_hide_range>0;
@@ -581,13 +581,13 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 	} else
 
 	// Show schedule's stop checkbox
-	if((buttons+22)==komp) {
+	if((buttons+22)==comp) {
 		env_t::visualize_schedule = !env_t::visualize_schedule;
 		buttons[22].pressed = env_t::visualize_schedule;
 	} else
 
 	// underground slice edit
-	if (komp == &inp_underground_level) {
+	if (comp == &inp_underground_level) {
 		if(grund_t::underground_mode==grund_t::ugm_level) {
 			grund_t::underground_level = inp_underground_level.get_value();
 
@@ -596,14 +596,14 @@ bool color_gui_t::action_triggered( gui_action_creator_t *komp, value_t v)
 		}
 	} else
 
-	if((buttons+23)==komp) {
+	if((buttons+23)==comp) {
 		create_win(new themeselector_t(), w_info, magic_themes);
 	}
-	if((buttons+24)==komp) {
+	if((buttons+24)==comp) {
 		env_t::simple_drawing = !env_t::simple_drawing;
 		buttons[24].pressed = env_t::simple_drawing;
 	}
-	if((buttons+25)==komp) {
+	if((buttons+25)==comp) {
 		create_win(new loadfont_frame_t(), w_info, magic_font);
 	}
 	welt->set_dirty();
diff --git a/gui/enlarge_map_frame_t.cc b/gui/enlarge_map_frame_t.cc
index df716494e..febf981f1 100644
--- a/gui/enlarge_map_frame_t.cc
+++ b/gui/enlarge_map_frame_t.cc
@@ -148,25 +148,25 @@ enlarge_map_frame_t::~enlarge_map_frame_t()
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool enlarge_map_frame_t::action_triggered( gui_action_creator_t *komp,value_t v)
+bool enlarge_map_frame_t::action_triggered( gui_action_creator_t *comp,value_t v)
 {
-	if(komp==&inp_x_size) {
+	if(comp==&inp_x_size) {
 		sets->set_size_x( v.i );
 		inp_x_size.set_increment_mode( v.i>=64 ? (v.i>=512 ? 128 : 64) : 8 );
 		update_preview();
 	}
-	else if(komp==&inp_y_size) {
+	else if(comp==&inp_y_size) {
 		sets->set_size_y( v.i );
 		inp_y_size.set_increment_mode( v.i>=64 ? (v.i>=512 ? 128 : 64) : 8 );
 		update_preview();
 	}
-	else if(komp==&inp_number_of_towns) {
+	else if(comp==&inp_number_of_towns) {
 		sets->set_city_count( v.i );
 	}
-	else if(komp==&inp_town_size) {
+	else if(comp==&inp_town_size) {
 		sets->set_mean_citizen_count( v.i );
 	}
-	else if(komp==&start_button) {
+	else if(comp==&start_button) {
 		// since soon those are invalid
 		intr_refresh_display( true );
 		welt->enlarge_map(sets, NULL);
diff --git a/gui/extend_edit.cc b/gui/extend_edit.cc
index aa0811f4b..5c2208e1a 100644
--- a/gui/extend_edit.cc
+++ b/gui/extend_edit.cc
@@ -102,9 +102,9 @@ bool extend_edit_gui_t::infowin_event(const event_t *ev)
 
 
 
-bool extend_edit_gui_t::action_triggered( gui_action_creator_t *komp,value_t /* */)           // 28-Dec-01    Markus Weber    Added
+bool extend_edit_gui_t::action_triggered( gui_action_creator_t *comp,value_t /* */)           // 28-Dec-01    Markus Weber    Added
 {
-	if (komp == &tabs) {
+	if (comp == &tabs) {
 		// switch list translation or object name
 		if (tabs.get_active_tab_index() == 0 && !is_show_trans_name) {
 			// show translation list
@@ -117,19 +117,19 @@ bool extend_edit_gui_t::action_triggered( gui_action_creator_t *komp,value_t /*
 			fill_list( is_show_trans_name );
 		}
 	}
-	else if (komp == &scl) {
+	else if (comp == &scl) {
 		// select an item of scroll list ?
 		change_item_info(scl.get_selection());
 	}
-	else if(  komp==&bt_obsolete  ) {
+	else if(  comp==&bt_obsolete  ) {
 		bt_obsolete.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_climates  ) {
+	else if(  comp==&bt_climates  ) {
 		bt_climates.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_timeline  ) {
+	else if(  comp==&bt_timeline  ) {
 		bt_timeline.pressed ^= 1;
 		fill_list( is_show_trans_name );
 	}
diff --git a/gui/factory_chart.cc b/gui/factory_chart.cc
index e3257e406..39bb67db8 100644
--- a/gui/factory_chart.cc
+++ b/gui/factory_chart.cc
@@ -299,12 +299,12 @@ factory_chart_t::~factory_chart_t()
 }
 
 
-bool factory_chart_t::action_triggered(gui_action_creator_t *komp, value_t)
+bool factory_chart_t::action_triggered(gui_action_creator_t *comp, value_t)
 {
 	if(  tab_panel.get_active_tab_index()==0  ) {
 		// case : goods statistics' buttons
 		for(  int b=0;  b<goods_button_count;  ++b  ) {
-			if(  komp==&goods_buttons[b]  ) {
+			if(  comp==&goods_buttons[b]  ) {
 				goods_buttons[b].pressed = !goods_buttons[b].pressed;
 				if(  goods_buttons[b].pressed  ) {
 					goods_chart.show_curve(b);
@@ -318,7 +318,7 @@ bool factory_chart_t::action_triggered(gui_action_creator_t *komp, value_t)
 	}
 	else {
 		for(int i=0; i < MAX_FAB_STAT+MAX_FAB_REF_LINE; i++) {
-			if (komp == button_to_curve[i].button) {
+			if (comp == button_to_curve[i].button) {
 				button_t* button = button_to_curve[i].button;
 				button->pressed = !button->pressed;
 				if(  button->pressed  ) {
diff --git a/gui/factory_edit.cc b/gui/factory_edit.cc
index 41a1f1c54..27072f5c2 100644
--- a/gui/factory_edit.cc
+++ b/gui/factory_edit.cc
@@ -165,17 +165,17 @@ void factory_edit_frame_t::fill_list( bool translate )
 
 
 
-bool factory_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_t e)
+bool factory_edit_frame_t::action_triggered( gui_action_creator_t *comp,value_t e)
 {
 	// only one chain can be shown
-	if(  komp==&bt_city_chain  ) {
+	if(  comp==&bt_city_chain  ) {
 		bt_city_chain.pressed ^= 1;
 		if(bt_city_chain.pressed) {
 			bt_land_chain.pressed = 0;
 		}
 		fill_list( is_show_trans_name );
 	}
-	else if(  komp==&bt_land_chain  ) {
+	else if(  comp==&bt_land_chain  ) {
 		bt_land_chain.pressed ^= 1;
 		if(bt_land_chain.pressed) {
 			bt_city_chain.pressed = 0;
@@ -183,10 +183,10 @@ bool factory_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_t
 		fill_list( is_show_trans_name );
 	}
 	else if(fac_desc) {
-		if (komp==&inp_production) {
+		if (comp==&inp_production) {
 			production = inp_production.get_value();
 		}
-		else if(  komp==&bt_left_rotate  &&  rotation!=255) {
+		else if(  comp==&bt_left_rotate  &&  rotation!=255) {
 			if(rotation==0) {
 				rotation = 255;
 			}
@@ -194,13 +194,13 @@ bool factory_edit_frame_t::action_triggered( gui_action_creator_t *komp,value_t
 				rotation --;
 			}
 		}
-		else if(  komp==&bt_right_rotate  &&  rotation!=fac_desc->get_building()->get_all_layouts()-1) {
+		else if(  comp==&bt_right_rotate  &&  rotation!=fac_desc->get_building()->get_all_layouts()-1) {
 			rotation ++;
 		}
 		// update info ...
 		change_item_info( scl.get_selection() );
 	}
-	return extend_edit_gui_t::action_triggered(komp,e);
+	return extend_edit_gui_t::action_triggered(comp,e);
 }
 
 
diff --git a/gui/factorylist_frame_t.cc b/gui/factorylist_frame_t.cc
index 9fa8301fa..834b822f1 100644
--- a/gui/factorylist_frame_t.cc
+++ b/gui/factorylist_frame_t.cc
@@ -71,14 +71,14 @@ factorylist_frame_t::factorylist_frame_t() :
  * This method is called if an action is triggered
  * @author Markus Weber/Volker Meyer
  */
-bool factorylist_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool factorylist_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &sortedby) {
+	if(comp == &sortedby) {
 		factorylist_stats_t::sort_mode = (factorylist_stats_t::sort_mode + 1) % factorylist::SORT_MODES;
 		sortedby.set_text(sort_text[factorylist_stats_t::sort_mode]);
 		scrolly.sort(0,NULL);
 	}
-	else if(komp == &sorteddir) {
+	else if(comp == &sorteddir) {
 		factorylist_stats_t::reverse = !factorylist_stats_t::reverse;
 		sorteddir.set_text( factorylist_stats_t::reverse ? "hl_btn_sort_desc" : "hl_btn_sort_asc");
 		scrolly.sort(0,NULL);
diff --git a/gui/goods_frame_t.cc b/gui/goods_frame_t.cc
index e72d1d10e..46aebec06 100644
--- a/gui/goods_frame_t.cc
+++ b/gui/goods_frame_t.cc
@@ -250,20 +250,20 @@ void goods_frame_t::resize(const scr_coord delta)
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool goods_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool goods_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &sortedby) {
+	if(comp == &sortedby) {
 		// sort by what
 		sortby = (sort_mode_t)((int)(sortby+1)%(int)SORT_MODES);
 	}
-	else if(komp == &sorteddir) {
+	else if(comp == &sorteddir) {
 		// order
 		sortreverse ^= 1;
 	}
-	else if(komp == &filter_goods_toggle) {
+	else if(comp == &filter_goods_toggle) {
 		filter_goods = !filter_goods;
 	}
-	else if(komp == &scheduletype) {
+	else if(comp == &scheduletype) {
 		double relative_speed_change = speed.get_value()/(double)welt->get_average_speed(simline_t::linetype_to_waytype(last_scheduletype));
 		last_scheduletype = (simline_t::linetype)(scheduletype.get_selection()+1);
 		speed.set_value( (welt->get_average_speed(simline_t::linetype_to_waytype(last_scheduletype))*relative_speed_change)+0.5 );
diff --git a/gui/halt_list_filter_frame.cc b/gui/halt_list_filter_frame.cc
index 4b1ad2522..98bac03de 100644
--- a/gui/halt_list_filter_frame.cc
+++ b/gui/halt_list_filter_frame.cc
@@ -171,48 +171,48 @@ halt_list_filter_frame_t::~halt_list_filter_frame_t()
  * This method is called if an action is triggered
  * @author V. Meyer
  */
-bool halt_list_filter_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool halt_list_filter_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
 	int i;
 
 	for (i = 0; i < FILTER_BUTTONS; i++) {
-		if (komp == filter_buttons + i) {
+		if (comp == filter_buttons + i) {
 			main_frame->set_filter(filter_buttons_types[i], !main_frame->get_filter(filter_buttons_types[i]));
 			main_frame->display_list();
 			return true;
 		}
 	}
-	if (komp == &ware_alle_ab) {
+	if (comp == &ware_alle_ab) {
 		main_frame->set_alle_ware_filter_ab(1);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &ware_keine_ab) {
+	if (comp == &ware_keine_ab) {
 		main_frame->set_alle_ware_filter_ab(0);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &ware_invers_ab) {
+	if (comp == &ware_invers_ab) {
 		main_frame->set_alle_ware_filter_ab(-1);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &ware_alle_an) {
+	if (comp == &ware_alle_an) {
 		main_frame->set_alle_ware_filter_an(1);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &ware_keine_an) {
+	if (comp == &ware_keine_an) {
 		main_frame->set_alle_ware_filter_an(0);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &ware_invers_an) {
+	if (comp == &ware_invers_an) {
 		main_frame->set_alle_ware_filter_an(-1);
 		main_frame->display_list();
 		return true;
 	}
-	if (komp == &name_filter_input) {
+	if (comp == &name_filter_input) {
 		main_frame->display_list();
 		return true;
 	}
diff --git a/gui/jump_frame.cc b/gui/jump_frame.cc
index 18e3e626d..a030366cd 100644
--- a/gui/jump_frame.cc
+++ b/gui/jump_frame.cc
@@ -51,9 +51,9 @@ jump_frame_t::jump_frame_t() :
  * This method is called if an action is triggered
  * @author V. Meyer
  */
-bool jump_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool jump_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &input || komp == &jumpbutton) {
+	if(comp == &input || comp == &jumpbutton) {
 		// OK- Button or Enter-Key pressed
 		//---------------------------------------
 		koord my_pos;
diff --git a/gui/karte.cc b/gui/karte.cc
index 201dcef20..6d95b8a9b 100644
--- a/gui/karte.cc
+++ b/gui/karte.cc
@@ -945,7 +945,7 @@ void reliefkarte_t::calc_map_size()
 	if(  isometric  ) {
 		size.x += zoom_in*2;
 	}
-	set_size( scr_size(size.x, size.y) ); // of the gui_komponete to adjust scroll bars
+	set_size( scr_size(size.x, size.y) ); // of the gui_componete to adjust scroll bars
 	needs_redraw = true;
 }
 
diff --git a/gui/kennfarbe.cc b/gui/kennfarbe.cc
index 35cd44ff8..5dba62440 100644
--- a/gui/kennfarbe.cc
+++ b/gui/kennfarbe.cc
@@ -94,12 +94,12 @@ farbengui_t::farbengui_t(player_t *player_) :
  * This method is called if an action is triggered
  * @author V. Meyer
  */
-bool farbengui_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool farbengui_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
 	for(unsigned i=0;  i<28;  i++) {
 
 		// new player 1 color?
-		if(komp==player_color_1+i) {
+		if(comp==player_color_1+i) {
 			for(unsigned j=0;  j<28;  j++) {
 				player_color_1[j].pressed = false;
 			}
@@ -111,7 +111,7 @@ bool farbengui_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
 		}
 
 		// new player color 2?
-		if(komp==player_color_2+i) {
+		if(comp==player_color_2+i) {
 			for(unsigned j=0;  j<28;  j++) {
 				player_color_2[j].pressed = false;
 			}
diff --git a/gui/label_info.cc b/gui/label_info.cc
index b82cc436d..9e0c8fd21 100644
--- a/gui/label_info.cc
+++ b/gui/label_info.cc
@@ -60,9 +60,9 @@ label_info_t::label_info_t(label_t* l) :
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool label_info_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool label_info_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &input  &&  welt->get_active_player()==label->get_owner()) {
+	if(comp == &input  &&  welt->get_active_player()==label->get_owner()) {
 		// check owner to change text
 		grund_t *gd = welt->lookup(label->get_pos());
 		if(  strcmp(gd->get_text(),edit_name)  ) {
diff --git a/gui/labellist_frame_t.cc b/gui/labellist_frame_t.cc
index 4e13e7b4d..f4276e47e 100644
--- a/gui/labellist_frame_t.cc
+++ b/gui/labellist_frame_t.cc
@@ -77,17 +77,17 @@ labellist_frame_t::labellist_frame_t() :
  * This method is called if an action is triggered
  * @author Markus Weber/Volker Meyer
  */
-bool labellist_frame_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool labellist_frame_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
-	if(komp == &sortedby) {
+	if(comp == &sortedby) {
 		set_sortierung((labellist::sort_mode_t)((get_sortierung() + 1) % labellist::SORT_MODES));
 		display_list();
 	}
-	else if(komp == &sorteddir) {
+	else if(comp == &sorteddir) {
 		set_reverse(!get_reverse());
 		display_list();
 	}
-	else if (komp == &filter) {
+	else if (comp == &filter) {
 		filter_state ^= 1;
 		filter.pressed = filter_state;
 		display_list();
diff --git a/gui/message_frame_t.cc b/gui/message_frame_t.cc
index 7c581553b..64411e993 100644
--- a/gui/message_frame_t.cc
+++ b/gui/message_frame_t.cc
@@ -119,19 +119,19 @@ void message_frame_t::resize(const scr_coord delta)
 
 
 /* triggered, when button clicked; only single button registered, so the action is clear ... */
-bool message_frame_t::action_triggered( gui_action_creator_t *komp, value_t v )
+bool message_frame_t::action_triggered( gui_action_creator_t *comp, value_t v )
 {
-	if(  komp==&option_bt  ) {
+	if(  comp==&option_bt  ) {
 		create_win(320, 200, new message_option_t(), w_info, magic_message_options );
 	}
-	else if(  komp==&input  &&  ibuf[0]!=0  ) {
+	else if(  comp==&input  &&  ibuf[0]!=0  ) {
 		// Send chat message to server for distribution
 		nwc_chat_t* nwchat = new nwc_chat_t( ibuf, welt->get_active_player()->get_player_nr(), env_t::nickname.c_str() );
 		network_send_server( nwchat );
 
 		ibuf[0] = 0;
 	}
-	else if(  komp==&tabs  ) {
+	else if(  comp==&tabs  ) {
 		// Knightly : filter messages by type where necessary
 		if(  stats.filter_messages( tab_categories[v.i] )  ) {
 			scrolly.set_scroll_position(0, 0);
diff --git a/gui/message_option_t.cc b/gui/message_option_t.cc
index 04cf884ea..8663d2bec 100644
--- a/gui/message_option_t.cc
+++ b/gui/message_option_t.cc
@@ -67,20 +67,20 @@ message_option_t::message_option_t() :
 }
 
 
-bool message_option_t::action_triggered( gui_action_creator_t *komp, value_t )
+bool message_option_t::action_triggered( gui_action_creator_t *comp, value_t )
 {
-	((button_t*)komp)->pressed ^= 1;
+	((button_t*)comp)->pressed ^= 1;
 	for(  int i=0;  i<message_t::MAX_MESSAGE_TYPE;  i++  ) {
-		if(&buttons[i*4+0]==komp) {
+		if(&buttons[i*4+0]==comp) {
 			ignore_msg ^= (1<<i);
 		}
-		if(&buttons[i*4+1]==komp) {
+		if(&buttons[i*4+1]==comp) {
 			ticker_msg ^= (1<<i);
 		}
-		if(&buttons[i*4+2]==komp) {
+		if(&buttons[i*4+2]==comp) {
 			auto_msg ^= (1<<i);
 		}
-		if(&buttons[i*4+3]==komp) {
+		if(&buttons[i*4+3]==comp) {
 			window_msg ^= (1<<i);
 		}
 	}
diff --git a/gui/password_frame.cc b/gui/password_frame.cc
index d92c56961..e83cdae72 100644
--- a/gui/password_frame.cc
+++ b/gui/password_frame.cc
@@ -76,9 +76,9 @@ password_frame_t::password_frame_t( player_t *player ) :
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool password_frame_t::action_triggered( gui_action_creator_t *komp, value_t p )
+bool password_frame_t::action_triggered( gui_action_creator_t *comp, value_t p )
 {
-	if(komp == &password  &&  (ibuf[0]!=0  ||  p.i == 1)) {
+	if(comp == &password  &&  (ibuf[0]!=0  ||  p.i == 1)) {
 		if (player->is_unlock_pending()) {
 			// unlock already pending, do not do everything twice
 			return true;
@@ -117,7 +117,7 @@ bool password_frame_t::action_triggered( gui_action_creator_t *komp, value_t p )
 		}
 	}
 
-	if(  komp == &player_name  ) {
+	if(  comp == &player_name  ) {
 		// rename a player
 		cbuffer_t buf;
 		buf.printf( "p%u,%s", player->get_player_nr(), player_name.get_text() );
diff --git a/gui/privatesign_info.cc b/gui/privatesign_info.cc
index 1733c7c9a..7307c342c 100644
--- a/gui/privatesign_info.cc
+++ b/gui/privatesign_info.cc
@@ -40,12 +40,12 @@ privatesign_info_t::privatesign_info_t(roadsign_t* s) :
  * components should be triggered.
  * V.Meyer
    */
-bool privatesign_info_t::action_triggered( gui_action_creator_t *komp, value_t /* */)
+bool privatesign_info_t::action_triggered( gui_action_creator_t *comp, value_t /* */)
 {
 	if(  welt->get_active_player() ==  sign->get_owner()  ) {
 		char param[256];
 		for(  int i=0;  i<PLAYER_UNOWNED;  i++  ) {
-			if(komp == &players[i]) {
+			if(comp == &players[i]) {
 				uint16 mask = sign->get_player_mask();
 				mask ^= 1 << i;
 				// change active player mask for this private sign
diff --git a/gui/schedule_gui.cc b/gui/schedule_gui.cc
index 104b09db5..4c03d6354 100644
--- a/gui/schedule_gui.cc
+++ b/gui/schedule_gui.cc
@@ -471,38 +471,38 @@ bool schedule_gui_t::infowin_event(const event_t *ev)
 }
 
 
-bool schedule_gui_t::action_triggered( gui_action_creator_t *komp, value_t p)
+bool schedule_gui_t::action_triggered( gui_action_creator_t *comp, value_t p)
 {
-DBG_MESSAGE("schedule_gui_t::action_triggered()","komp=%p combo=%p",komp,&line_selector);
+DBG_MESSAGE("schedule_gui_t::action_triggered()","comp=%p combo=%p",comp,&line_selector);
 
-	if(komp == &bt_add) {
+	if(comp == &bt_add) {
 		mode = adding;
 		bt_add.pressed = true;
 		bt_insert.pressed = false;
 		bt_remove.pressed = false;
 		update_tool( true );
 	}
-	else if(komp == &bt_insert) {
+	else if(comp == &bt_insert) {
 		mode = inserting;
 		bt_add.pressed = false;
 		bt_insert.pressed = true;
 		bt_remove.pressed = false;
 		update_tool( true );
 	}
-	else if(komp == &bt_remove) {
+	else if(comp == &bt_remove) {
 		mode = removing;
 		bt_add.pressed = false;
 		bt_insert.pressed = false;
 		bt_remove.pressed = true;
 		update_tool( false );
 	}
-	else if(komp == &numimp_load) {
+	else if(comp == &numimp_load) {
 		if (!schedule->empty()) {
 			schedule->entries[schedule->get_current_stop()].minimum_loading = (uint8)p.i;
 			update_selection();
 		}
 	}
-	else if(komp == &bt_wait_prev) {
+	else if(comp == &bt_wait_prev) {
 		if(!schedule->empty()) {
 			sint8& wait = schedule->entries[schedule->get_current_stop()].waiting_time_shift;
 			if(wait>7) {
@@ -517,7 +517,7 @@ DBG_MESSAGE("schedule_gui_t::action_triggered()","komp=%p combo=%p",komp,&line_s
 			update_selection();
 		}
 	}
-	else if(komp == &bt_wait_next) {
+	else if(comp == &bt_wait_next) {
 		if(!schedule->empty()) {
 			sint8& wait = schedule->entries[schedule->get_current_stop()].waiting_time_shift;
 			if(wait==0) {
@@ -532,10 +532,10 @@ DBG_MESSAGE("schedule_gui_t::action_triggered()","komp=%p combo=%p",komp,&line_s
 			update_selection();
 		}
 	}
-	else if(komp == &bt_return) {
+	else if(comp == &bt_return) {
 		schedule->add_return_way();
 	}
-	else if(komp == &line_selector) {
+	else if(comp == &line_selector) {
 		uint32 selection = p.i;
 //DBG_MESSAGE("schedule_gui_t::action_triggered()","line selection=%i",selection);
 		if(  line_scrollitem_t *li = dynamic_cast<line_scrollitem_t*>(line_selector.get_element(selection))  ) {
@@ -550,7 +550,7 @@ DBG_MESSAGE("schedule_gui_t::action_triggered()","komp=%p combo=%p",komp,&line_s
 			line_selector.set_selection( 0 );
 		}
 	}
-	else if(komp == &bt_promote_to_line) {
+	else if(comp == &bt_promote_to_line) {
 		// update line schedule via tool!
 		tool_t *tool = create_tool( TOOL_CHANGE_LINE | SIMPLE_TOOL );
 		cbuffer_t buf;
diff --git a/gui/schedule_list.cc b/gui/schedule_list.cc
index 7b8990bda..744dea7d8 100644
--- a/gui/schedule_list.cc
+++ b/gui/schedule_list.cc
@@ -341,14 +341,14 @@ bool schedule_list_gui_t::infowin_event(const event_t *ev)
 }
 
 
-bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t v )           // 28-Dec-01    Markus Weber    Added
+bool schedule_list_gui_t::action_triggered( gui_action_creator_t *comp, value_t v )           // 28-Dec-01    Markus Weber    Added
 {
-	if(  komp == &bt_edit_line  ) {
+	if(  comp == &bt_edit_line  ) {
 		if(  line.is_bound()  ) {
 			create_win( new line_management_gui_t(line, player), w_info, (ptrdiff_t)line.get_rep() );
 		}
 	}
-	else if(  komp == &bt_new_line  ) {
+	else if(  comp == &bt_new_line  ) {
 		// create typed line
 		assert(  tabs.get_active_tab_index() > 0  &&  tabs.get_active_tab_index()<max_idx  );
 		// update line schedule via tool!
@@ -362,7 +362,7 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t
 		delete tmp_tool;
 		depot_t::update_all_win();
 	}
-	else if(  komp == &bt_delete_line  ) {
+	else if(  comp == &bt_delete_line  ) {
 		if(  line.is_bound()  ) {
 			tool_t *tmp_tool = create_tool( TOOL_CHANGE_LINE | SIMPLE_TOOL );
 			cbuffer_t buf;
@@ -374,7 +374,7 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t
 			depot_t::update_all_win();
 		}
 	}
-	else if(  komp == &bt_withdraw_line  ) {
+	else if(  comp == &bt_withdraw_line  ) {
 		bt_withdraw_line.pressed ^= 1;
 		if (  line.is_bound()  ) {
 			tool_t *tmp_tool = create_tool( TOOL_CHANGE_LINE | SIMPLE_TOOL );
@@ -386,7 +386,7 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t
 			delete tmp_tool;
 		}
 	}
-	else if(  komp == &tabs  ) {
+	else if(  comp == &tabs  ) {
 		int const tab = tabs.get_active_tab_index();
 		uint8 old_selected_tab = selected_tab[player->get_player_nr()];
 		selected_tab[player->get_player_nr()] = tabs_to_lineindex[tab];
@@ -404,7 +404,7 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t
 			bt_new_line.disable();
 		}
 	}
-	else if(  komp == &scl  ) {
+	else if(  comp == &scl  ) {
 		if(  line_scrollitem_t *li=(line_scrollitem_t *)scl.get_element(v.i)  ) {
 			update_lineinfo( li->get_line() );
 		}
@@ -415,19 +415,19 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *komp, value_t
 		selected_line[player->get_player_nr()][selected_tab[player->get_player_nr()]] = line;
 		selected_line[player->get_player_nr()][0] = line; // keep these the same in overview
 	}
-	else if(  komp == &inp_filter  ) {
+	else if(  comp == &inp_filter  ) {
 		if(  strcmp(old_schedule_filter,schedule_filter)  ) {
 			build_line_list(tabs.get_active_tab_index());
 			strcpy(old_schedule_filter,schedule_filter);
 		}
 	}
-	else if(  komp == &inp_name  ) {
+	else if(  comp == &inp_name  ) {
 		rename_line();
 	}
 	else {
 		if(  line.is_bound()  ) {
 			for(  int i=0;  i<MAX_LINE_COST;  i++  ) {
-				if(  komp == &filterButtons[i]  ) {
+				if(  comp == &filterButtons[i]  ) {
 					filterButtons[i].pressed ^= 1;
 					if(  filterButtons[i].pressed  ) {
 						chart.show_curve(i);
diff --git a/gui/server_frame.cc b/gui/server_frame.cc
index eb047c8db..3eb83557d 100644
--- a/gui/server_frame.cc
+++ b/gui/server_frame.cc
@@ -399,10 +399,10 @@ bool server_frame_t::infowin_event (const event_t *ev)
 }
 
 
-bool server_frame_t::action_triggered (gui_action_creator_t *komp, value_t p)
+bool server_frame_t::action_triggered (gui_action_creator_t *comp, value_t p)
 {
 	// Selection has changed
-	if(  &serverlist == komp  ) {
+	if(  &serverlist == comp  ) {
 		if(  p.i <= -1  ) {
 			join.disable();
 			gi = gameinfo_t(welt);
@@ -428,7 +428,7 @@ bool server_frame_t::action_triggered (gui_action_creator_t *komp, value_t p)
 			}
 		}
 	}
-	else if (  &add == komp  ||  &addinput ==komp  ) {
+	else if (  &add == comp  ||  &addinput ==comp  ) {
 		if (  newserver_name[0] != '\0'  ) {
 			join.disable();
 
@@ -447,17 +447,17 @@ bool server_frame_t::action_triggered (gui_action_creator_t *komp, value_t p)
 			serverlist.set_selection( -1 );
 		}
 	}
-	else if (  &show_mismatched == komp  ) {
+	else if (  &show_mismatched == comp  ) {
 		show_mismatched.pressed ^= 1;
 		serverlist.clear_elements();
 		update_serverlist();
 	}
-	else if (  &show_offline == komp  ) {
+	else if (  &show_offline == comp  ) {
 		show_offline.pressed ^= 1;
 		serverlist.clear_elements();
 		update_serverlist();
 	}
-	else if (  &nick == komp  ) {
+	else if (  &nick == comp  ) {
 		char* nickname = nick.get_text();
 		if (  env_t::networkmode  ) {
 			// Only try and change the nick with server if we're in network mode
@@ -471,7 +471,7 @@ bool server_frame_t::action_triggered (gui_action_creator_t *komp, value_t p)
 			env_t::nickname = nickname;
 		}
 	}
-	else if (  &join == komp  ) {
+	else if (  &join == comp  ) {
 		char* nickname = nick.get_text();
 		if (  strlen( nickname ) == 0  ) {
 			// forbid joining?
@@ -496,7 +496,7 @@ bool server_frame_t::action_triggered (gui_action_creator_t *komp, value_t p)
 			join.disable();
 		}
 	}
-	else if (  &find_mismatch == komp  ) {
+	else if (  &find_mismatch == comp  ) {
 		if (  gui_frame_t *info = win_get_magic(magic_pakset_info_t)  ) {
 			top_win( info );
 		}
diff --git a/gui/settings_frame.cc b/gui/settings_frame.cc
index ac27f1c3d..3641ae6a8 100644
--- a/gui/settings_frame.cc
+++ b/gui/settings_frame.cc
@@ -84,9 +84,9 @@ void settings_frame_t::resize(const scr_coord delta)
 
 
  /* triggered, when button clicked; only single button registered, so the action is clear ... */
-bool settings_frame_t::action_triggered( gui_action_creator_t *komp, value_t )
+bool settings_frame_t::action_triggered( gui_action_creator_t *comp, value_t )
 {
-	if(  komp==&revert_to_default  ) {
+	if(  comp==&revert_to_default  ) {
 		// reread from simucon.tab(s) the settings and apply them
 		tabfile_t simuconf;
 		env_t::init();
@@ -124,7 +124,7 @@ bool settings_frame_t::action_triggered( gui_action_creator_t *komp, value_t )
 		costs.init( sets );
 		climates.init( sets );
 	}
-	else if(  komp==&revert_to_last_save  ) {
+	else if(  comp==&revert_to_last_save  ) {
 		// load settings of last generated map
 		loadsave_t file;
 		dr_chdir( env_t::user_dir  );
diff --git a/gui/settings_stats.cc b/gui/settings_stats.cc
index 31d1b6496..49a72ae5d 100644
--- a/gui/settings_stats.cc
+++ b/gui/settings_stats.cc
@@ -62,9 +62,9 @@ void settings_stats_t::free_all()
 }
 
 
-bool settings_general_stats_t::action_triggered(gui_action_creator_t *komp, value_t v)
+bool settings_general_stats_t::action_triggered(gui_action_creator_t *comp, value_t v)
 {
-	assert( komp==&savegame ); (void)komp;
+	assert( comp==&savegame ); (void)comp;
 
 	if(  v.i==-1  ) {
 		savegame.set_selection( 0 );
@@ -599,13 +599,13 @@ void settings_climates_stats_t::read(settings_t* const sets)
 }
 
 
-bool settings_climates_stats_t::action_triggered(gui_action_creator_t *komp, value_t)
+bool settings_climates_stats_t::action_triggered(gui_action_creator_t *comp, value_t)
 {
 	welt_gui_t *welt_gui = dynamic_cast<welt_gui_t *>(win_get_magic( magic_welt_gui_t ));
 	read( local_sets );
 	uint i = 0;
 	FORX(slist_tpl<gui_numberinput_t*>, const n, numinp, ++i) {
-		if (n == komp && i < 3 && welt_gui) {
+		if (n == comp && i < 3 && welt_gui) {
 			// update world preview
 			welt_gui->update_preview();
 		}
diff --git a/gui/signal_spacing.cc b/gui/signal_spacing.cc
index 0d4c7f97b..564adc465 100644
--- a/gui/signal_spacing.cc
+++ b/gui/signal_spacing.cc
@@ -59,16 +59,16 @@ signal_spacing_frame_t::signal_spacing_frame_t(player_t *player_, tool_build_roa
 	set_windowsize( scr_size( L_DIALOG_WIDTH, D_TITLEBAR_HEIGHT + cursor.y + D_MARGIN_BOTTOM ) );
 }
 
-bool signal_spacing_frame_t::action_triggered( gui_action_creator_t *komp, value_t)
+bool signal_spacing_frame_t::action_triggered( gui_action_creator_t *comp, value_t)
 {
-	if( komp == &signal_spacing_inp ) {
+	if( comp == &signal_spacing_inp ) {
 		signal_spacing = signal_spacing_inp.get_value();
 	}
-	else if( komp == &remove_button ) {
+	else if( comp == &remove_button ) {
 		remove = !remove;
 		remove_button.pressed = remove;
 	}
-	else if( komp == &replace_button ) {
+	else if( comp == &replace_button ) {
 		replace = !replace;
 		replace_button.pressed = replace;
 	}
diff --git a/gui/sound_frame.cc b/gui/sound_frame.cc
index dcaecd63c..0da9545ff 100644
--- a/gui/sound_frame.cc
+++ b/gui/sound_frame.cc
@@ -119,37 +119,37 @@ sound_frame_t::sound_frame_t()
 }
 
 
-bool sound_frame_t::action_triggered( gui_action_creator_t *komp, value_t p)
+bool sound_frame_t::action_triggered( gui_action_creator_t *comp, value_t p)
 {
-	if (komp == &next_song_button) {
+	if (comp == &next_song_button) {
 		midi_stop();
 		midi_next_track();
 		check_midi();
 		song_name_label.set_text(make_song_name());
 	}
-	else if (komp == &previous_song_button) {
+	else if (comp == &previous_song_button) {
 		midi_stop();
 		midi_last_track();
 		check_midi();
 		song_name_label.set_text(make_song_name());
 	}
-	else if (komp == &shuffle_song_button) {
+	else if (comp == &shuffle_song_button) {
 		sound_set_shuffle_midi( !sound_get_shuffle_midi() );
 		shuffle_song_button.pressed = sound_get_shuffle_midi();
 	}
-	else if (komp == &sound_mute_button) {
+	else if (comp == &sound_mute_button) {
 		sound_set_mute( !sound_mute_button.pressed );
 		sound_mute_button.pressed = sound_get_mute();
 	}
-	else if (komp == &music_mute_button) {
+	else if (comp == &music_mute_button) {
 		midi_set_mute( !music_mute_button.pressed );
 		music_mute_button.pressed = midi_get_mute();
 		previous_song_button.enable(!music_mute_button.pressed);
 	}
-	else if (komp == &sound_volume_scrollbar) {
+	else if (comp == &sound_volume_scrollbar) {
 		sound_set_global_volume(p.i);
 	}
-	else if (komp == &music_volume_scrollbar) {
+	else if (comp == &music_volume_scrollbar) {
 		sound_set_midi_volume(p.i);
 	}
 	return true;
diff --git a/gui/sprachen.cc b/gui/sprachen.cc
index 901da39fa..1da5427ff 100644
--- a/gui/sprachen.cc
+++ b/gui/sprachen.cc
@@ -188,12 +188,12 @@ sprachengui_t::sprachengui_t() :
 }
 
 
-bool sprachengui_t::action_triggered( gui_action_creator_t *komp, value_t)
+bool sprachengui_t::action_triggered( gui_action_creator_t *comp, value_t)
 {
 	for(int i=0; i<translator::get_language_count(); i++) {
 		button_t *b = buttons[i].button;
 
-		if(b == komp) {
+		if(b == comp) {
 			b->pressed = true;
 			translator::set_language(buttons[i].id);
 			init_font_from_lang(true);
diff --git a/gui/station_building_select.cc b/gui/station_building_select.cc
index 93da715dc..581a75c9c 100644
--- a/gui/station_building_select.cc
+++ b/gui/station_building_select.cc
@@ -118,10 +118,10 @@ station_building_select_t::station_building_select_t(const building_desc_t *desc
  * This method is called if an action is triggered
  * @author V. Meyer
  */
-bool station_building_select_t::action_triggered( gui_action_creator_t *komp,value_t /* */)
+bool station_building_select_t::action_triggered( gui_action_creator_t *comp,value_t /* */)
 {
 	for(int i=0; i<4; i++) {
-		if(komp == &actionbutton[i]) {
+		if(comp == &actionbutton[i]) {
 			static char default_str[1024];
 			sprintf( default_str, "%s,%i", desc->get_name(), i );
 			tool.set_default_param(default_str);
diff --git a/gui/trafficlight_info.cc b/gui/trafficlight_info.cc
index 3765eec02..d9337ef05 100644
--- a/gui/trafficlight_info.cc
+++ b/gui/trafficlight_info.cc
@@ -53,20 +53,20 @@ trafficlight_info_t::trafficlight_info_t(roadsign_t* s) :
  * components should be triggered.
  * V.Meyer
    */
-bool trafficlight_info_t::action_triggered( gui_action_creator_t *komp, value_t v)
+bool trafficlight_info_t::action_triggered( gui_action_creator_t *comp, value_t v)
 {
 	char param[256];
-	if(komp == &ns) {
+	if(comp == &ns) {
 		sprintf( param, "%s,1,%i", ampel->get_pos().get_str(), (int)v.i );
 		tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT]->set_default_param( param );
 		welt->set_tool( tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT], welt->get_active_player() );
 	}
-	else if(komp == &ow) {
+	else if(comp == &ow) {
 		sprintf( param, "%s,0,%i", ampel->get_pos().get_str(), (int)v.i );
 		tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT]->set_default_param( param );
 		welt->set_tool( tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT], welt->get_active_player() );
 	}
- 	else if(komp == &offset) {
+ 	else if(comp == &offset) {
 		sprintf( param, "%s,2,%i", ampel->get_pos().get_str(), (int)v.i );
 		tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT]->set_default_param( param );
 		welt->set_tool( tool_t::simple_tool[TOOL_CHANGE_TRAFFIC_LIGHT], welt->get_active_player() );
diff --git a/gui/welt.cc b/gui/welt.cc
index 440823ebd..a860c66e0 100644
--- a/gui/welt.cc
+++ b/gui/welt.cc
@@ -446,16 +446,16 @@ void welt_gui_t::resize_preview()
  * This method is called if an action is triggered
  * @author Hj. Malthaner
  */
-bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
+bool welt_gui_t::action_triggered( gui_action_creator_t *comp,value_t v)
 {
 	// check for changed map (update preview for any event)
 	int knr = inp_map_number.get_value(); //
 
-	if(komp==&inp_map_number) {
+	if(comp==&inp_map_number) {
 		sets->heightfield = "";
 		loaded_heightfield = false;
 	}
-	else if(komp==&inp_x_size) {
+	else if(comp==&inp_x_size) {
 		if(  !loaded_heightfield  ) {
 			sets->set_size_x( v.i );
 			inp_x_size.set_increment_mode( v.i>=64 ? (v.i>=512 ? 128 : 64) : 8 );
@@ -466,7 +466,7 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			inp_x_size.set_value(sets->get_size_x()); // can't change size with heightfield loaded
 		}
 	}
-	else if(komp==&inp_y_size) {
+	else if(comp==&inp_y_size) {
 		if(  !loaded_heightfield  ) {
 			sets->set_size_y( v.i );
 			inp_y_size.set_increment_mode( v.i>=64 ? (v.i>=512 ? 128 : 64) : 8 );
@@ -477,35 +477,35 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			inp_y_size.set_value(sets->get_size_y()); // can't change size with heightfield loaded
 		}
 	}
-	else if(komp==&inp_number_of_towns) {
+	else if(comp==&inp_number_of_towns) {
 		sets->set_city_count( v.i );
 		city_density = sets->get_city_count() ? sqrt((double)sets->get_size_x()*sets->get_size_y()) / sets->get_city_count() : 0.0;
 	}
-	else if(komp==&inp_town_size) {
+	else if(comp==&inp_town_size) {
 		sets->set_mean_citizen_count( v.i );
 	}
-	else if(komp==&inp_intercity_road_len) {
+	else if(comp==&inp_intercity_road_len) {
 		env_t::intercity_road_length = v.i;
 		inp_intercity_road_len.set_increment_mode( v.i>=1000 ? 100 : 20 );
 	}
-	else if(komp==&inp_other_industries) {
+	else if(comp==&inp_other_industries) {
 		sets->set_factory_count( v.i );
 		industry_density = sets->get_factory_count() ? sqrt((double)sets->get_size_x()*sets->get_size_y()) / sets->get_factory_count() : 0.0;
 	}
-	else if(komp==&inp_tourist_attractions) {
+	else if(comp==&inp_tourist_attractions) {
 		sets->set_tourist_attractions( v.i );
 		attraction_density = sets->get_tourist_attractions() ? sqrt((double)sets->get_size_x()*sets->get_size_y()) / sets->get_tourist_attractions() : 0.0;
 	}
-	else if(komp==&inp_intro_date) {
+	else if(comp==&inp_intro_date) {
 		sets->set_starting_year( (sint16)(v.i) );
 	}
-	else if(komp==&random_map) {
+	else if(comp==&random_map) {
 		knr = simrand(9999);
 		inp_map_number.set_value(knr);
 		sets->heightfield = "";
 		loaded_heightfield = false;
 	}
-	else if(komp==&load_map) {
+	else if(comp==&load_map) {
 		// load relief
 		loaded_heightfield = false;
 		sets->heightfield = "";
@@ -513,7 +513,7 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 		create_win((display_get_width() - lrf->get_windowsize().w-10), 40, lrf, w_info, magic_load_t );
 		knr = sets->get_map_number();	// otherwise using cancel would not show the normal generated map again
 	}
-	else if(komp==&use_intro_dates) {
+	else if(comp==&use_intro_dates) {
 		// 0,1 should force setting to new game as well. don't allow to change
 		// 2,3 allow to change
 		if(sets->get_use_timeline()&2) {
@@ -522,11 +522,11 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			use_intro_dates.pressed = sets->get_use_timeline()&1;
 		}
 	}
-	else if(komp==&use_beginner_mode) {
+	else if(comp==&use_beginner_mode) {
 		sets->beginner_mode = sets->get_beginner_mode()^1;
 		use_beginner_mode.pressed = sets->get_beginner_mode();
 	}
-	else if(komp==&open_setting_gui) {
+	else if(comp==&open_setting_gui) {
 		gui_frame_t *sg = win_get_magic( magic_settings_frame_t );
 		if(  sg  ) {
 			destroy_win( sg );
@@ -537,7 +537,7 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			open_setting_gui.pressed = true;
 		}
 	}
-	else if(komp==&open_climate_gui) {
+	else if(comp==&open_climate_gui) {
 		gui_frame_t *climate_gui = win_get_magic( magic_climate );
 		if(  climate_gui  ) {
 			destroy_win( climate_gui );
@@ -549,16 +549,16 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			open_climate_gui.pressed = true;
 		}
 	}
-	else if(komp==&load_game) {
+	else if(comp==&load_game) {
 		welt->get_message()->clear();
 		create_win( new loadsave_frame_t(true), w_info, magic_load_t);
 	}
-	else if(komp==&load_scenario) {
+	else if(comp==&load_scenario) {
 		destroy_all_win(true);
 		welt->get_message()->clear();
 		create_win( new scenario_frame_t(), w_info, magic_load_t );
 	}
-	else if(komp==&start_game) {
+	else if(comp==&start_game) {
 		destroy_all_win(true);
 		welt->get_message()->clear();
 		create_win(200, 100, new news_img("Erzeuge neue Karte.\n", skinverwaltung_t::neueweltsymbol->get_image_id(0)), w_info, magic_none);
@@ -580,7 +580,7 @@ bool welt_gui_t::action_triggered( gui_action_creator_t *komp,value_t v)
 			file.close();
 		}
 	}
-	else if(komp==&quit_game) {
+	else if(comp==&quit_game) {
 		destroy_all_win(true);
 		env_t::quit_simutrans = true;
 	}