diff --git a/src/actions/advancement.cpp b/src/actions/advancement.cpp
index 4b4f9172375..68e5606d8e9 100644
--- a/src/actions/advancement.cpp
+++ b/src/actions/advancement.cpp
@@ -314,7 +314,7 @@ unit_ptr get_amla_unit(const unit &u, const config &mod_option)
 }
 
 
-void advance_unit(map_location loc, const tadvancement_option &advance_to, bool fire_event)
+void advance_unit(map_location loc, const advancement_option &advance_to, bool fire_event)
 {
 	unit_map::unit_iterator u = resources::units->find(loc);
 	if(!u.valid()) {
diff --git a/src/actions/advancement.hpp b/src/actions/advancement.hpp
index d798dea061c..b21663b32f5 100644
--- a/src/actions/advancement.hpp
+++ b/src/actions/advancement.hpp
@@ -63,7 +63,7 @@ unit_ptr get_advanced_unit(const unit &u, const std::string &advance_to);
  */
 unit_ptr get_amla_unit(const unit &u, const config &mod_option);
 
-using tadvancement_option = boost::variant<std::string /*change type*/, const config* /*apply amla*/>;
+using advancement_option = boost::variant<std::string /*change type*/, const config* /*apply amla*/>;
 
 /**
  * Function which will advance the unit at @a loc to 'advance_to'.
@@ -73,4 +73,4 @@ using tadvancement_option = boost::variant<std::string /*change type*/, const co
  * we couldn't safely pass in a reference to the item in the map
  * that we're going to delete, since deletion would invalidate the reference.
  */
-void advance_unit(map_location loc, const tadvancement_option &advance_to, bool fire_event = true);
+void advance_unit(map_location loc, const advancement_option &advance_to, bool fire_event = true);
diff --git a/src/game_board.cpp b/src/game_board.cpp
index 4b82031b574..457b975ba6f 100644
--- a/src/game_board.cpp
+++ b/src/game_board.cpp
@@ -302,7 +302,7 @@ bool game_board::change_terrain(const map_location &loc, const std::string &t_st
 	t_translation::terrain_code terrain = t_translation::read_terrain_code(t_str);
 	if (terrain == t_translation::NONE_TERRAIN) return false;
 
-	terrain_type_data::tmerge_mode mode = terrain_type_data::BOTH;
+	terrain_type_data::merge_mode mode = terrain_type_data::BOTH;
 
 	if (mode_str == "base") mode = terrain_type_data::BASE;
 	else if (mode_str == "overlay") mode = terrain_type_data::OVERLAY;
diff --git a/src/game_events/action_wml.hpp b/src/game_events/action_wml.hpp
index 188386af7f7..289f447872a 100644
--- a/src/game_events/action_wml.hpp
+++ b/src/game_events/action_wml.hpp
@@ -71,7 +71,7 @@ namespace game_events
 	 * Ensures that villages are properly lost and that new terrains are discovered.
 	 */
 	void change_terrain(const map_location &loc, const t_translation::terrain_code &t,
-	                    terrain_type_data::tmerge_mode mode, bool replace_if_failed);
+	                    terrain_type_data::merge_mode mode, bool replace_if_failed);
 }
 
 #endif // GAME_EVENTS_ACTION_WML_H_INCLUDED
diff --git a/src/generators/cave_map_generator.cpp b/src/generators/cave_map_generator.cpp
index e21b799a158..d70ec688cc8 100644
--- a/src/generators/cave_map_generator.cpp
+++ b/src/generators/cave_map_generator.cpp
@@ -360,7 +360,7 @@ void cave_map_generator::cave_map_generator_job::place_castle(int starting_posit
 		t_translation::coordinate coord(
 				  loc.x + gamemap::default_border
 				, loc.y + gamemap::default_border);
-		starting_positions_.insert(t_translation::tstarting_positions::value_type(std::to_string(starting_position), coord));
+		starting_positions_.insert(t_translation::starting_positions::value_type(std::to_string(starting_position), coord));
 	}
 
 	map_location adj[6];
diff --git a/src/generators/cave_map_generator.hpp b/src/generators/cave_map_generator.hpp
index f466f2eb221..d1a82853f7a 100644
--- a/src/generators/cave_map_generator.hpp
+++ b/src/generators/cave_map_generator.hpp
@@ -81,7 +81,7 @@ private:
 		bool flipx_, flipy_;
 
 		t_translation::ter_map map_;
-		t_translation::tstarting_positions starting_positions_;
+		t_translation::starting_positions starting_positions_;
 		std::map<std::string,size_t> chamber_ids_;
 		std::vector<chamber> chambers_;
 		std::vector<passage> passages_;
diff --git a/src/generators/default_map_generator_job.cpp b/src/generators/default_map_generator_job.cpp
index c5219de47be..40507b59a3a 100644
--- a/src/generators/default_map_generator_job.cpp
+++ b/src/generators/default_map_generator_job.cpp
@@ -525,7 +525,7 @@ map_location default_map_generator_job::random_point_at_side(size_t width, size_
 
 /** Function which, given the map will output it in a valid format. */
 static std::string output_map(const terrain_map& terrain,
-		t_translation::tstarting_positions& starting_positions)
+		t_translation::starting_positions& starting_positions)
 {
 	// Remember that we only want the middle 1/9th of the map.
 	// All other segments of the map are there only to give
@@ -783,7 +783,7 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
 		}
 	}
 
-	t_translation::tstarting_positions starting_positions;
+	t_translation::starting_positions starting_positions;
 	LOG_NG << output_map(terrain, starting_positions);
 	LOG_NG << "Placed landforms. " << (SDL_GetTicks() - ticks) << " ticks elapsed" << "\n";
 	ticks = SDL_GetTicks();
@@ -1148,7 +1148,7 @@ std::string default_map_generator_job::default_generate_map(generator_data data,
 		const int y = c->y;
 		const int player = c - castles.begin() + 1;
 		const t_translation::coordinate coord(x, y);
-		starting_positions.insert(t_translation::tstarting_positions::value_type(std::to_string(player), coord));
+		starting_positions.insert(t_translation::starting_positions::value_type(std::to_string(player), coord));
 		terrain[x][y] = t_translation::HUMAN_KEEP;
 
 		const int castle_array[13][2] = {
diff --git a/src/gui/auxiliary/filter.hpp b/src/gui/auxiliary/filter.hpp
index 901a45ac00a..3788a2864b9 100644
--- a/src/gui/auxiliary/filter.hpp
+++ b/src/gui/auxiliary/filter.hpp
@@ -30,8 +30,8 @@ namespace gui2
 {
 
 template <class T>
-inline bool sort(const pane::titem& lhs,
-				 const pane::titem& rhs,
+inline bool sort(const pane::item& lhs,
+				 const pane::item& rhs,
 				 const std::string& tag,
 				 const bool ascending)
 {
@@ -63,7 +63,7 @@ inline bool sort(const pane::titem& lhs,
  *
  * @returns                       Whether or not the comparison found a match.
  */
-inline bool contains(const pane::titem& item,
+inline bool contains(const pane::item& item,
 					 const std::string& tag,
 					 const text_box& text_box)
 {
diff --git a/src/gui/core/window_builder.cpp b/src/gui/core/window_builder.cpp
index c9e08c5714a..28fac9cb918 100644
--- a/src/gui/core/window_builder.cpp
+++ b/src/gui/core/window_builder.cpp
@@ -105,8 +105,8 @@ window* build(CVideo& video, const builder_window::window_resolution* definition
 
 	win->set_click_dismiss(definition->click_dismiss);
 
-	std::shared_ptr<const window_definition::tresolution>
-	conf = std::static_pointer_cast<const window_definition::tresolution>(
+	std::shared_ptr<const window_definition::resolution>
+	conf = std::static_pointer_cast<const window_definition::resolution>(
 			win->config());
 	assert(conf);
 
diff --git a/src/gui/core/window_builder/helper.hpp b/src/gui/core/window_builder/helper.hpp
index 3d41cc4e6df..032cad31509 100644
--- a/src/gui/core/window_builder/helper.hpp
+++ b/src/gui/core/window_builder/helper.hpp
@@ -28,7 +28,7 @@ namespace gui2
 namespace implementation
 {
 
-using scrollbar_mode = scrollbar_container::tscrollbar_mode;
+using scrollbar_mode = scrollbar_container::scrollbar_mode;
 
 /**
  * Returns the vertical alignment.
diff --git a/src/gui/dialogs/addon/description.cpp b/src/gui/dialogs/addon/description.cpp
index 10654d17a8d..d8329e3ca4f 100644
--- a/src/gui/dialogs/addon/description.cpp
+++ b/src/gui/dialogs/addon/description.cpp
@@ -380,7 +380,7 @@ void addon_description::pre_show(window& window)
 	url_textbox.set_active(false);
 
 	if(!feedback_url_.empty()) {
-		url_none.set_visible(control::tvisible::invisible);
+		url_none.set_visible(control::visibility::invisible);
 
 		connect_signal_mouse_left_click(
 				url_go_button,
@@ -398,15 +398,15 @@ void addon_description::pre_show(window& window)
 		url_go_button.set_active(false);
 		url_copy_button.set_active(false);
 
-		url_go_button.set_visible(control::tvisible::invisible);
-		url_copy_button.set_visible(control::tvisible::invisible);
-		url_textbox.set_visible(control::tvisible::invisible);
+		url_go_button.set_visible(control::visibility::invisible);
+		url_copy_button.set_visible(control::visibility::invisible);
+		url_textbox.set_visible(control::visibility::invisible);
 	}
 
 	if(!desktop::open_object_is_supported()) {
 		// No point in displaying the button on platforms that can't do
 		// open_object().
-		url_go_button.set_visible(control::tvisible::invisible);
+		url_go_button.set_visible(control::visibility::invisible);
 	}
 }
 
diff --git a/src/gui/dialogs/addon/list.cpp b/src/gui/dialogs/addon/list.cpp
index ff0067f39c6..1d06588dbdf 100644
--- a/src/gui/dialogs/addon/list.cpp
+++ b/src/gui/dialogs/addon/list.cpp
@@ -402,7 +402,7 @@ void addon_manager::pre_show(window& window)
 	if(!desktop::open_object_is_supported()) {
 		// No point in displaying the button on platforms that can't do
 		// open_object().
-		url_go_button.set_visible(control::tvisible::invisible);
+		url_go_button.set_visible(control::visibility::invisible);
 	}
 
 	connect_signal_mouse_left_click(
diff --git a/src/gui/dialogs/campaign_difficulty.cpp b/src/gui/dialogs/campaign_difficulty.cpp
index 365c871a55a..cd2281ec0e4 100644
--- a/src/gui/dialogs/campaign_difficulty.cpp
+++ b/src/gui/dialogs/campaign_difficulty.cpp
@@ -150,7 +150,7 @@ void campaign_difficulty::pre_show(window& window)
 
 		widget *widget = grid->find("victory", false);
 		if (widget && !preferences::is_campaign_completed(campaign_id_, d["define"])) {
-			widget->set_visible(widget::tvisible::hidden);
+			widget->set_visible(widget::visibility::hidden);
 		}
 	}
 }
diff --git a/src/gui/dialogs/campaign_selection.cpp b/src/gui/dialogs/campaign_selection.cpp
index 5a339ed3bc3..eec4c2e84b7 100644
--- a/src/gui/dialogs/campaign_selection.cpp
+++ b/src/gui/dialogs/campaign_selection.cpp
@@ -208,7 +208,7 @@ void campaign_selection::pre_show(window& window)
 		if(tree_view* tree
 		   = find_widget<tree_view>(&window, "campaign_tree", false, false)) {
 
-			tree->set_visible(widget::tvisible::invisible);
+			tree->set_visible(widget::visibility::invisible);
 		}
 
 		/***** Setup campaign list. *****/
@@ -249,7 +249,7 @@ void campaign_selection::pre_show(window& window)
 
 			widget* widget = grid->find("victory", false);
 			if(widget && !campaign["completed"].to_bool()) {
-				widget->set_visible(widget::tvisible::hidden);
+				widget->set_visible(widget::visibility::hidden);
 			}
 
 			/*** Add detail item ***/
diff --git a/src/gui/dialogs/debug_clock.cpp b/src/gui/dialogs/debug_clock.cpp
index 8e99af84011..0b60e42987d 100644
--- a/src/gui/dialogs/debug_clock.cpp
+++ b/src/gui/dialogs/debug_clock.cpp
@@ -170,13 +170,13 @@ void debug_clock::update_time(const bool force)
 	}
 }
 
-debug_clock::ttime::ttime() : hour(0), minute(0), second(0), millisecond(0)
+debug_clock::time::time() : hour(0), minute(0), second(0), millisecond(0)
 {
 }
 
-void debug_clock::ttime::set_current_time()
+void debug_clock::time::set_current_time()
 {
-	time_t now = time(nullptr);
+	time_t now = ::time(nullptr);
 	tm* stamp = localtime(&now);
 
 	hour = stamp->tm_hour;
@@ -185,7 +185,7 @@ void debug_clock::ttime::set_current_time()
 	millisecond = 0;
 }
 
-bool debug_clock::ttime::step(const unsigned milliseconds)
+bool debug_clock::time::step(const unsigned milliseconds)
 {
 	millisecond += milliseconds;
 
diff --git a/src/gui/dialogs/debug_clock.hpp b/src/gui/dialogs/debug_clock.hpp
index dd9a9184861..6c42b398ac6 100644
--- a/src/gui/dialogs/debug_clock.hpp
+++ b/src/gui/dialogs/debug_clock.hpp
@@ -81,9 +81,9 @@ private:
 	event::signal_function signal_;
 
 	/** Helper struct to keep track of the time. */
-	struct ttime
+	struct time
 	{
-		ttime();
+		time();
 
 		/**
 		 * Sets the fields to the current time.
@@ -125,7 +125,7 @@ private:
 	 * @note Since the dialog is used to test the drawing routine by keeping
 	 * track of the calls to the drawing routine, the clock might be off.
 	 */
-	ttime time_;
+	time time_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const;
diff --git a/src/gui/dialogs/end_credits.cpp b/src/gui/dialogs/end_credits.cpp
index b6577289ecb..30f96fa02c6 100644
--- a/src/gui/dialogs/end_credits.cpp
+++ b/src/gui/dialogs/end_credits.cpp
@@ -121,9 +121,9 @@ void end_credits::pre_show(window& window)
 	// This should probably be implemented as a scrollbar mode.
 	// Also, for some reason hiding the whole grid doesn't work, and the elements need to be hidden manually
 	if(grid* v_grid = dynamic_cast<grid*>(text_widget_->find("_vertical_scrollbar_grid", false))) {
-		find_widget<scrollbar_base>(v_grid, "_vertical_scrollbar", false).set_visible(widget::tvisible::hidden);
-		find_widget<repeating_button>(v_grid, "_half_page_up", false).set_visible(widget::tvisible::hidden);
-		find_widget<repeating_button>(v_grid, "_half_page_down", false).set_visible(widget::tvisible::hidden);
+		find_widget<scrollbar_base>(v_grid, "_vertical_scrollbar", false).set_visible(widget::visibility::hidden);
+		find_widget<repeating_button>(v_grid, "_half_page_up", false).set_visible(widget::visibility::hidden);
+		find_widget<repeating_button>(v_grid, "_half_page_down", false).set_visible(widget::visibility::hidden);
 	}
 }
 
diff --git a/src/gui/dialogs/file_dialog.cpp b/src/gui/dialogs/file_dialog.cpp
index 1da7815b017..e26d32e6c35 100644
--- a/src/gui/dialogs/file_dialog.cpp
+++ b/src/gui/dialogs/file_dialog.cpp
@@ -176,7 +176,7 @@ void file_dialog::pre_show(window& window)
 	title.set_label(title_);
 
 	if(msg_.empty()) {
-		message.set_visible(gui2::widget::tvisible::invisible);
+		message.set_visible(gui2::widget::visibility::invisible);
 	} else {
 		message.set_label(msg_);
 		message.set_use_markup(true);
@@ -263,8 +263,8 @@ void file_dialog::pre_show(window& window)
 		mkdir_button.set_active(false);
 		rm_button.set_active(false);
 
-		mkdir_button.set_visible(widget::tvisible::invisible);
-		rm_button.set_visible(widget::tvisible::invisible);
+		mkdir_button.set_visible(widget::visibility::invisible);
+		rm_button.set_visible(widget::visibility::invisible);
 	}
 
 	refresh_fileview(window);
@@ -662,7 +662,7 @@ void file_dialog::on_bookmark_add_cmd(window& window)
 
 	std::string label = default_label;
 
-	const bool confirm = tbookmark_create::execute(label, window.video());
+	const bool confirm = bookmark_create::execute(label, window.video());
 	if(!confirm) {
 		return;
 	}
diff --git a/src/gui/dialogs/folder_create.hpp b/src/gui/dialogs/folder_create.hpp
index 046dd91e4aa..ea427276708 100644
--- a/src/gui/dialogs/folder_create.hpp
+++ b/src/gui/dialogs/folder_create.hpp
@@ -44,7 +44,7 @@ public:
 	}
 
 private:
-	friend class tbookmark_create;
+	friend class bookmark_create;
 
 	bool bookmark_mode_;
 
@@ -62,7 +62,7 @@ private:
 	void pre_show(window& window);
 };
 
-class tbookmark_create
+class bookmark_create
 {
 public:
 	/** The execute function; see @ref modal_dialog for more information. */
diff --git a/src/gui/dialogs/game_version.cpp b/src/gui/dialogs/game_version.cpp
index 740d3255ecc..697d2edae45 100644
--- a/src/gui/dialogs/game_version.cpp
+++ b/src/gui/dialogs/game_version.cpp
@@ -180,7 +180,7 @@ void game_version::pre_show(window& window)
 		if(!desktop::open_object_is_supported()) {
 			// No point in displaying these on platforms that can't do
 			// open_object().
-			browse_w.set_visible(control::tvisible::invisible);
+			browse_w.set_visible(control::visibility::invisible);
 		}
 
 		if(!desktop::clipboard::available()) {
@@ -192,7 +192,7 @@ void game_version::pre_show(window& window)
 #ifndef _WIN32
 	grid& w32_options_grid
 			= find_widget<grid>(&window, "win32_paths", false);
-	w32_options_grid.set_visible(widget::tvisible::invisible);
+	w32_options_grid.set_visible(widget::visibility::invisible);
 #else
 	button& stderr_button
 			= find_widget<button>(&window, "open_stderr", false);
diff --git a/src/gui/dialogs/gamestate_inspector.cpp b/src/gui/dialogs/gamestate_inspector.cpp
index 0857dc6da5b..1259049a9cb 100644
--- a/src/gui/dialogs/gamestate_inspector.cpp
+++ b/src/gui/dialogs/gamestate_inspector.cpp
@@ -204,12 +204,12 @@ public:
 			std::ostringstream out;
 			out << current_page_ + 1 << '/' << n_pages;
 			pages_->set_label(out.str());
-			left_->set_visible(widget::tvisible::visible);
-			right_->set_visible(widget::tvisible::visible);
+			left_->set_visible(widget::visibility::visible);
+			right_->set_visible(widget::visibility::visible);
 		} else {
 			pages_->set_label("");
-			left_->set_visible(widget::tvisible::invisible);
-			right_->set_visible(widget::tvisible::invisible);
+			left_->set_visible(widget::visibility::invisible);
+			right_->set_visible(widget::visibility::invisible);
 		}
 	}
 
@@ -217,8 +217,8 @@ public:
 	{
 		stuff_list_->clear();
 		pages_->set_label("");
-		left_->set_visible(widget::tvisible::invisible);
-		right_->set_visible(widget::tvisible::invisible);
+		left_->set_visible(widget::visibility::invisible);
+		right_->set_visible(widget::visibility::invisible);
 	}
 
 	void page(int where)
@@ -420,8 +420,8 @@ public:
 				std::bind(&gamestate_inspector::controller::handle_page_button_clicked,
 					this, true));
 
-		left_button->set_visible(widget::tvisible::invisible);
-		right_button->set_visible(widget::tvisible::invisible);
+		left_button->set_visible(widget::visibility::invisible);
+		right_button->set_visible(widget::visibility::invisible);
 
 		if (!desktop::clipboard::available()) {
 			copy_button->set_active(false);
diff --git a/src/gui/dialogs/lobby/info.cpp b/src/gui/dialogs/lobby/info.cpp
index fc18f32013c..f1b77dedd57 100644
--- a/src/gui/dialogs/lobby/info.cpp
+++ b/src/gui/dialogs/lobby/info.cpp
@@ -67,7 +67,7 @@ void lobby_info::delete_games()
 }
 namespace gui2
 {
-void do_mp_notify(t_notify_mode mode, const std::string & sender, const std::string & message)
+void do_mp_notify(notify_mode mode, const std::string & sender, const std::string & message)
 {
 	switch (mode) {
 	case NOTIFY_WHISPER:
diff --git a/src/gui/dialogs/lobby/info.hpp b/src/gui/dialogs/lobby/info.hpp
index 842a36ff391..cf8192bfb6b 100644
--- a/src/gui/dialogs/lobby/info.hpp
+++ b/src/gui/dialogs/lobby/info.hpp
@@ -119,7 +119,7 @@ private:
 	boost::dynamic_bitset<> games_visibility_;
 };
 
-enum t_notify_mode {
+enum notify_mode {
 	NOTIFY_NONE,
 	NOTIFY_MESSAGE,
 	NOTIFY_MESSAGE_OTHER_WINDOW,
@@ -135,7 +135,7 @@ enum t_notify_mode {
 
 namespace gui2
 {
-	void do_mp_notify(t_notify_mode mode, const std::string & sender, const std::string & message);
-	inline void do_mp_notify(t_notify_mode mode) { do_mp_notify(mode, "", ""); }
+	void do_mp_notify(notify_mode mode, const std::string & sender, const std::string & message);
+	inline void do_mp_notify(notify_mode mode) { do_mp_notify(mode, "", ""); }
 }
 #endif
diff --git a/src/gui/dialogs/lobby/lobby.cpp b/src/gui/dialogs/lobby/lobby.cpp
index bbb9b6ddd4c..d633f1c9a2d 100644
--- a/src/gui/dialogs/lobby/lobby.cpp
+++ b/src/gui/dialogs/lobby/lobby.cpp
@@ -240,7 +240,7 @@ void modify_grid_with_data(grid* grid, const std::map<std::string, string_map>&
 void set_visible_if_exists(grid* grid, const std::string& id, bool visible)
 {
 	if(widget* w = grid->find(id, false)) {
-		w->set_visible(visible ? widget::tvisible::visible : widget::tvisible::invisible);
+		w->set_visible(visible ? widget::visibility::visible : widget::visibility::invisible);
 	}
 }
 
@@ -1093,7 +1093,7 @@ void lobby_main::user_dialog_callback(user_info* info)
 	delay_playerlist_update_ = true;
 
 	if(dlg.result_open_whisper()) {
-		tlobby_chat_window* t = chatbox_->whisper_window_open(info->name, true);
+		lobby_chat_window* t = chatbox_->whisper_window_open(info->name, true);
 		chatbox_->switch_to_window(t);
 	}
 
diff --git a/src/gui/dialogs/lobby/lobby.hpp b/src/gui/dialogs/lobby/lobby.hpp
index c65d31a4994..97eeeff92c8 100644
--- a/src/gui/dialogs/lobby/lobby.hpp
+++ b/src/gui/dialogs/lobby/lobby.hpp
@@ -108,8 +108,8 @@ public:
 		CREATE
 	};
 
-	void do_notify(t_notify_mode mode) { do_notify(mode, "", ""); }
-	void do_notify(t_notify_mode mode, const std::string & sender, const std::string & message) { do_mp_notify(mode, sender, message); }
+	void do_notify(notify_mode mode) { do_notify(mode, "", ""); }
+	void do_notify(notify_mode mode, const std::string & sender, const std::string & message) { do_mp_notify(mode, sender, message); }
 
 protected:
 
diff --git a/src/gui/dialogs/lobby/player_info.cpp b/src/gui/dialogs/lobby/player_info.cpp
index 4160324173b..5056bbc0394 100644
--- a/src/gui/dialogs/lobby/player_info.cpp
+++ b/src/gui/dialogs/lobby/player_info.cpp
@@ -119,7 +119,7 @@ void lobby_player_info::pre_show(window& window)
 
 	if(!preferences::is_authenticated()) {
 		widget* aw = window.find("admin", false);
-		aw->set_visible(widget::tvisible::invisible);
+		aw->set_visible(widget::visibility::invisible);
 	}
 }
 
diff --git a/src/gui/dialogs/message.cpp b/src/gui/dialogs/message.cpp
index 04c1f3790ee..3a334b8bef8 100644
--- a/src/gui/dialogs/message.cpp
+++ b/src/gui/dialogs/message.cpp
@@ -80,14 +80,14 @@ void message::pre_show(window& window)
 	if(!title_.empty()) {
 		title_widget.set_label(title_);
 	} else {
-		title_widget.set_visible(widget::tvisible::invisible);
+		title_widget.set_visible(widget::visibility::invisible);
 	}
 
 	control& img_widget = find_widget<image>(&window, "image", false);
 	if(!image_.empty()) {
 		img_widget.set_label(image_);
 	} else {
-		img_widget.set_visible(widget::tvisible::invisible);
+		img_widget.set_visible(widget::visibility::invisible);
 	}
 
 	control& label = find_widget<control>(&window, "label", false);
@@ -120,7 +120,7 @@ void message::set_button_caption(const button_id button,
 }
 
 void message::set_button_visible(const button_id button,
-								  const widget::tvisible visible)
+								  const widget::visibility visible)
 {
 	buttons_[button].visible = visible;
 	if(buttons_[button].button) {
@@ -139,7 +139,7 @@ void message::set_button_retval(const button_id button, const int retval)
 message::tbutton_status::tbutton_status()
 	: button(nullptr)
 	, caption()
-	, visible(widget::tvisible::invisible)
+	, visible(widget::visibility::invisible)
 	, retval(window::NONE)
 {
 }
@@ -176,25 +176,25 @@ int show_message(CVideo& video,
 		case message::auto_close:
 			break;
 		case message::ok_button:
-			dlg.set_button_visible(message::ok, widget::tvisible::visible);
+			dlg.set_button_visible(message::ok, widget::visibility::visible);
 			dlg.set_button_caption(message::ok, _("OK"));
 			break;
 		case message::close_button:
-			dlg.set_button_visible(message::ok, widget::tvisible::visible);
+			dlg.set_button_visible(message::ok, widget::visibility::visible);
 			break;
 		case message::ok_cancel_buttons:
-			dlg.set_button_visible(message::ok, widget::tvisible::visible);
+			dlg.set_button_visible(message::ok, widget::visibility::visible);
 			dlg.set_button_caption(message::ok, _("OK"));
 		/* FALL DOWN */
 		case message::cancel_button:
 			dlg.set_button_visible(message::cancel,
-								   widget::tvisible::visible);
+								   widget::visibility::visible);
 			break;
 		case message::yes_no_buttons:
-			dlg.set_button_visible(message::ok, widget::tvisible::visible);
+			dlg.set_button_visible(message::ok, widget::visibility::visible);
 			dlg.set_button_caption(message::ok, _("Yes"));
 			dlg.set_button_visible(message::cancel,
-								   widget::tvisible::visible);
+								   widget::visibility::visible);
 			dlg.set_button_caption(message::cancel, _("No"));
 			break;
 	}
diff --git a/src/gui/dialogs/message.hpp b/src/gui/dialogs/message.hpp
index 4fb8608c5dd..9adb850a9f3 100644
--- a/src/gui/dialogs/message.hpp
+++ b/src/gui/dialogs/message.hpp
@@ -82,7 +82,7 @@ public:
 							const std::string& caption);
 
 	void set_button_visible(const button_id button,
-							const widget::tvisible visible);
+							const widget::visibility visible);
 
 	void set_button_retval(const button_id button, const int retval);
 
@@ -144,7 +144,7 @@ private:
 
 		button* button;
 		std::string caption;
-		widget::tvisible visible;
+		widget::visibility visible;
 		int retval;
 	};
 
diff --git a/src/gui/dialogs/multiplayer/mp_alerts_options.cpp b/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
index 6f22cdea9d7..654a6bacf8b 100644
--- a/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
+++ b/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
@@ -137,16 +137,16 @@ void mp_alerts_options::pre_show(window& window)
 
 	toggle_button * in_lobby;
 	in_lobby = &find_widget<toggle_button>(&window,"ready_for_start_lobby", false);
-	in_lobby->set_visible(widget::tvisible::invisible);
+	in_lobby->set_visible(widget::visibility::invisible);
 
 	in_lobby = &find_widget<toggle_button>(&window,"game_has_begun_lobby", false);
-	in_lobby->set_visible(widget::tvisible::invisible);
+	in_lobby->set_visible(widget::visibility::invisible);
 
 	in_lobby = &find_widget<toggle_button>(&window,"turn_changed_sound", false); // If we get a sound for this then don't remove this button
-	in_lobby->set_visible(widget::tvisible::invisible);
+	in_lobby->set_visible(widget::visibility::invisible);
 
 	in_lobby = &find_widget<toggle_button>(&window,"turn_changed_lobby", false);
-	in_lobby->set_visible(widget::tvisible::invisible);
+	in_lobby->set_visible(widget::visibility::invisible);
 
 	button * defaults;
 	defaults = &find_widget<button>(&window,"revert_to_defaults", false);
diff --git a/src/gui/dialogs/multiplayer/mp_cmd_wrapper.cpp b/src/gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
index ce7c8adbcdd..9ce6da7dc9f 100644
--- a/src/gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
+++ b/src/gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
@@ -113,7 +113,7 @@ void mp_cmd_wrapper::pre_show(window& window)
 
 	if(grid* g = find_widget<grid>(&window, "mod_options", false, false)) {
 		g->set_active(authenticated);
-		g->set_visible(authenticated ? widget::tvisible::visible : widget::tvisible::invisible);
+		g->set_visible(authenticated ? widget::visibility::visible : widget::visibility::invisible);
 	}
 
 	/**
diff --git a/src/gui/dialogs/multiplayer/mp_create_game.cpp b/src/gui/dialogs/multiplayer/mp_create_game.cpp
index d334c740323..b334e8a32f1 100644
--- a/src/gui/dialogs/multiplayer/mp_create_game.cpp
+++ b/src/gui/dialogs/multiplayer/mp_create_game.cpp
@@ -262,7 +262,7 @@ void mp_create_game::pre_show(window& win)
 
 	// No mods, hide the header
 	if(mod_list.get_item_count() <= 0) {
-		find_widget<control>(&win, "mods_header", false).set_visible(window::tvisible::invisible);
+		find_widget<control>(&win, "mods_header", false).set_visible(window::visibility::invisible);
 	} else {
 		on_mod_select(win);
 	}
diff --git a/src/gui/dialogs/multiplayer/mp_join_game.cpp b/src/gui/dialogs/multiplayer/mp_join_game.cpp
index dd84cb79739..b1a47530776 100644
--- a/src/gui/dialogs/multiplayer/mp_join_game.cpp
+++ b/src/gui/dialogs/multiplayer/mp_join_game.cpp
@@ -297,7 +297,7 @@ void mp_join_game::pre_show(window& window)
 	plugins_context_->set_callback("chat",   [&chat](const config& cfg) { chat.send_chat_message(cfg["message"], false); }, true);
 
 	// TODO: the old mp wait dialog didn't have an OK button. Evaluate if we want to add one. Hiding it for now
-	find_widget<button>(&window, "ok", false).set_visible(widget::tvisible::hidden);
+	find_widget<button>(&window, "ok", false).set_visible(widget::visibility::hidden);
 }
 
 void mp_join_game::generate_side_list(window& window)
@@ -408,8 +408,8 @@ void mp_join_game::generate_side_list(window& window)
 		grid& row_grid = node.get_grid();
 
 		if(income_amt == 0) {
-			find_widget<image>(&row_grid, "income_icon", false).set_visible(widget::tvisible::invisible);
-			find_widget<label>(&row_grid, "side_income", false).set_visible(widget::tvisible::invisible);
+			find_widget<image>(&row_grid, "income_icon", false).set_visible(widget::visibility::invisible);
+			find_widget<label>(&row_grid, "side_income", false).set_visible(widget::visibility::invisible);
 		}
 	}
 }
diff --git a/src/gui/dialogs/multiplayer/mp_options_helper.cpp b/src/gui/dialogs/multiplayer/mp_options_helper.cpp
index 4ad26b00fbc..d3be9436aa0 100644
--- a/src/gui/dialogs/multiplayer/mp_options_helper.cpp
+++ b/src/gui/dialogs/multiplayer/mp_options_helper.cpp
@@ -131,7 +131,7 @@ int mp_options_helper::remove_nodes_for_type(const std::string& type)
 void mp_options_helper::update_status_label()
 {
 	// No custom options, display a message
-	no_options_notice_.set_visible(options_tree_.empty() ? window::tvisible::visible : window::tvisible::invisible);
+	no_options_notice_.set_visible(options_tree_.empty() ? window::visibility::visible : window::visibility::invisible);
 }
 
 template<typename T>
diff --git a/src/gui/dialogs/multiplayer/mp_staging.cpp b/src/gui/dialogs/multiplayer/mp_staging.cpp
index 6156f98f96c..45cc8549221 100644
--- a/src/gui/dialogs/multiplayer/mp_staging.cpp
+++ b/src/gui/dialogs/multiplayer/mp_staging.cpp
@@ -284,8 +284,8 @@ void mp_staging::add_side_node(window& window, ng::side_engine_ptr side)
 
 	// TODO: maybe display the saved values
 	if(saved_game) {
-		slider_gold.set_visible(widget::tvisible::invisible);
-		slider_income.set_visible(widget::tvisible::invisible);
+		slider_gold.set_visible(widget::visibility::invisible);
+		slider_income.set_visible(widget::visibility::invisible);
 	}
 
 	//
@@ -323,7 +323,7 @@ void mp_staging::on_controller_select(ng::side_engine_ptr side, grid& row_grid)
 	menu_button& controller_selection = find_widget<menu_button>(&row_grid, "controller", false);
 
 	if(side->controller_changed(controller_selection.get_value())) {
-		ai_selection.set_visible(side->controller() == ng::CNTR_COMPUTER ? widget::tvisible::visible : widget::tvisible::hidden);
+		ai_selection.set_visible(side->controller() == ng::CNTR_COMPUTER ? widget::visibility::visible : widget::visibility::hidden);
 
 		set_state_changed();
 	}
diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index b46fbb1d1ef..d3505a58e22 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -175,7 +175,7 @@ void preferences_dialog::update_friends_list_controls(window& window, listbox& l
 	find_widget<button>(&window, "remove", false).set_active(!list_empty);
 
 	find_widget<label>(&window, "no_friends_notice", false).set_visible(
-		list_empty ? window::tvisible::visible : window::tvisible::invisible);
+		list_empty ? window::visibility::visible : window::visibility::invisible);
 }
 
 void preferences_dialog::add_friend_list_entry(const bool is_friend, text_box& textbox, window& window)
@@ -553,11 +553,11 @@ void preferences_dialog::post_build(window& window)
 		assert(main_grid);
 
 		grid& details_grid = find_widget<grid>(main_grid, "prefs_setter_grid", false);
-		details_grid.set_visible(control::tvisible::invisible);
+		details_grid.set_visible(control::visibility::invisible);
 
 		// The toggle widget for toggle-type options (hidden for other types)
 		toggle_button& toggle_box = find_widget<toggle_button>(main_grid, "value_toggle", false);
-		toggle_box.set_visible(control::tvisible::hidden);
+		toggle_box.set_visible(control::visibility::hidden);
 
 		if(!option["description"].empty()) {
 			find_widget<control>(main_grid, "description", false).set_label(option["description"]);
@@ -567,7 +567,7 @@ void preferences_dialog::post_build(window& window)
 			case ADVANCED_PREF_TYPE::TOGGLE: {
 				//main_grid->remove_child("setter");
 
-				toggle_box.set_visible(control::tvisible::visible);
+				toggle_box.set_visible(control::visibility::visible);
 				toggle_box.set_value(get(pref_name, option["default"].to_bool()));
 
 				connect_signal_mouse_left_click(toggle_box, std::bind(
@@ -905,12 +905,12 @@ void preferences_dialog::on_advanced_prefs_list_select(listbox& list, window& wi
 
 	if(has_description || (selected_type != ADVANCED_PREF_TYPE::SPECIAL && selected_type != ADVANCED_PREF_TYPE::TOGGLE)) {
 		find_widget<widget>(get_advanced_row_grid(list, selected_row), "prefs_setter_grid", false)
-			.set_visible(control::tvisible::visible);
+			.set_visible(control::visibility::visible);
 	}
 
 	if(last_selected_item_ != selected_row) {
 		find_widget<widget>(get_advanced_row_grid(list, last_selected_item_), "prefs_setter_grid", false)
-			.set_visible(control::tvisible::invisible);
+			.set_visible(control::visibility::invisible);
 
 		last_selected_item_ = selected_row;
 	}
diff --git a/src/gui/dialogs/simple_item_selector.cpp b/src/gui/dialogs/simple_item_selector.cpp
index adaa985b3ad..cca905c44cb 100644
--- a/src/gui/dialogs/simple_item_selector.cpp
+++ b/src/gui/dialogs/simple_item_selector.cpp
@@ -114,7 +114,7 @@ void simple_item_selector::pre_show(window& window)
 	}
 
 	if(single_button_) {
-		button_cancel.set_visible(gui2::widget::tvisible::invisible);
+		button_cancel.set_visible(gui2::widget::visibility::invisible);
 	}
 }
 
diff --git a/src/gui/dialogs/tip.cpp b/src/gui/dialogs/tip.cpp
index e07bd0fcb41..33d3735be72 100644
--- a/src/gui/dialogs/tip.cpp
+++ b/src/gui/dialogs/tip.cpp
@@ -164,7 +164,7 @@ void show(CVideo& video,
 	{
 		t.show(video);
 	}
-	catch(twindow_builder_invalid_id&)
+	catch(window_builder_invalid_id&)
 	{
 		ERR_CFG << "Tip with the requested id '" << window_id
 				<< "' doesn't exist, fall back to the default.\n";
@@ -173,7 +173,7 @@ void show(CVideo& video,
 		{
 			t.show(video);
 		}
-		catch(twindow_builder_invalid_id&)
+		catch(window_builder_invalid_id&)
 		{
 			ERR_CFG << "Default tooltip doesn't exist, no message shown."
 					<< std::endl;
diff --git a/src/gui/dialogs/title_screen.cpp b/src/gui/dialogs/title_screen.cpp
index 54b461b1361..fe7880a41cf 100644
--- a/src/gui/dialogs/title_screen.cpp
+++ b/src/gui/dialogs/title_screen.cpp
@@ -417,7 +417,7 @@ void title_screen::pre_show(window& win)
 	});
 
 	if(game_config_manager::get()->game_config().child_range("core").size() <= 1) {
-		find_widget<button>(&win, "cores", false).set_visible(window::tvisible::invisible);
+		find_widget<button>(&win, "cores", false).set_visible(window::visibility::invisible);
 	}
 
 	//
@@ -457,8 +457,8 @@ void title_screen::pre_show(window& win)
 		std::bind(&title_screen::show_debug_clock_window, this, std::ref(win.video())));
 
 	find_widget<button>(&win, "clock", false).set_visible(show_debug_clock_button
-		? widget::tvisible::visible
-		: widget::tvisible::invisible);
+		? widget::visibility::visible
+		: widget::visibility::invisible);
 }
 
 void title_screen::on_resize(window& win)
diff --git a/src/gui/dialogs/title_screen.hpp b/src/gui/dialogs/title_screen.hpp
index 67e7d01a4f3..057badf8ac5 100644
--- a/src/gui/dialogs/title_screen.hpp
+++ b/src/gui/dialogs/title_screen.hpp
@@ -46,7 +46,7 @@ public:
 	 * Values for actions which leave the title screen.
 	 * Actions that merely show a dialog are not included here.
 	 */
-	enum tresult {
+	enum result {
 		// Start playing a single-player game, such as the tutorial or a campaign
 		LAUNCH_GAME,
 		// Connect to an MP server
diff --git a/src/gui/dialogs/transient_message.cpp b/src/gui/dialogs/transient_message.cpp
index 19e2abf7bbc..9b1c80b0a26 100644
--- a/src/gui/dialogs/transient_message.cpp
+++ b/src/gui/dialogs/transient_message.cpp
@@ -46,12 +46,12 @@ void transient_message::pre_show(window& window)
 {
 	if(hide_title_) {
 		widget& title = find_widget<widget>(&window, "title", false);
-		title.set_visible(widget::tvisible::invisible);
+		title.set_visible(widget::visibility::invisible);
 	}
 
 	if(hide_image_) {
 		widget& image = find_widget<widget>(&window, "image", false);
-		image.set_visible(widget::tvisible::invisible);
+		image.set_visible(widget::visibility::invisible);
 	}
 }
 } // namespace dialogs
diff --git a/src/gui/dialogs/unit_list.cpp b/src/gui/dialogs/unit_list.cpp
index 7ffc0c570c9..c6f61e67b9a 100644
--- a/src/gui/dialogs/unit_list.cpp
+++ b/src/gui/dialogs/unit_list.cpp
@@ -153,19 +153,19 @@ void unit_list::pre_show(window& window)
 		// NOTE: this needs to be done *after* the row is added
 		// TODO: show custom statuses
 		if(!unit->get_state(unit::STATE_PETRIFIED)) {
-			find_widget<image>(row_grid, "unit_status_petrified", false).set_visible(widget::tvisible::invisible);
+			find_widget<image>(row_grid, "unit_status_petrified", false).set_visible(widget::visibility::invisible);
 		}
 
 		if(!unit->get_state(unit::STATE_POISONED)) {
-			find_widget<image>(row_grid, "unit_status_poisoned", false).set_visible(widget::tvisible::invisible);
+			find_widget<image>(row_grid, "unit_status_poisoned", false).set_visible(widget::visibility::invisible);
 		}
 
 		if(!unit->get_state(unit::STATE_SLOWED)) {
-			find_widget<image>(row_grid, "unit_status_slowed", false).set_visible(widget::tvisible::invisible);
+			find_widget<image>(row_grid, "unit_status_slowed", false).set_visible(widget::visibility::invisible);
 		}
 
 		if(!unit->invisible(unit->get_location(), *resources::gameboard, false)) {
-			find_widget<image>(row_grid, "unit_status_invisible", false).set_visible(widget::tvisible::invisible);
+			find_widget<image>(row_grid, "unit_status_invisible", false).set_visible(widget::visibility::invisible);
 		}
 	}
 
diff --git a/src/gui/dialogs/wml_error.cpp b/src/gui/dialogs/wml_error.cpp
index a32e568e79e..a25d6a9b372 100644
--- a/src/gui/dialogs/wml_error.cpp
+++ b/src/gui/dialogs/wml_error.cpp
@@ -209,13 +209,13 @@ void wml_error::pre_show(window& window)
 {
 	if(!have_files_) {
 		control& filelist = find_widget<control>(&window, "files", false);
-		filelist.set_visible(control::tvisible::invisible);
+		filelist.set_visible(control::visibility::invisible);
 	}
 
 	if(!have_post_summary_) {
 		control& post_summary
 				= find_widget<control>(&window, "post_summary", false);
-		post_summary.set_visible(control::tvisible::invisible);
+		post_summary.set_visible(control::visibility::invisible);
 	}
 
 	button& copy_button = find_widget<button>(&window, "copy", false);
diff --git a/src/gui/dialogs/wml_message.cpp b/src/gui/dialogs/wml_message.cpp
index 2c849db05b0..efcbac5f25e 100644
--- a/src/gui/dialogs/wml_message.cpp
+++ b/src/gui/dialogs/wml_message.cpp
@@ -94,8 +94,8 @@ void wml_message_base::pre_show(window& window)
 		window.set_click_dismiss(false);
 		window.set_escape_disabled(true);
 	} else {
-		caption.set_visible(widget::tvisible::invisible);
-		input.set_visible(widget::tvisible::invisible);
+		caption.set_visible(widget::visibility::invisible);
+		input.set_visible(widget::visibility::invisible);
 	}
 
 	// Find the option list related fields.
@@ -129,7 +129,7 @@ void wml_message_base::pre_show(window& window)
 			// click_dismiss has been disabled due to the input.
 		}
 	} else {
-		options.set_visible(widget::tvisible::invisible);
+		options.set_visible(widget::visibility::invisible);
 	}
 	window.set_click_dismiss(!has_input_ && option_list_.empty());
 }
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index f33874469dc..a4c1ff28038 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -153,7 +153,7 @@ button_definition::button_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing button " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -184,7 +184,7 @@ button_definition::button_definition(const config& cfg)
  * @end{tag}{name="button_definition"}
  * @end{parent}{name="gui/"}
  */
-button_definition::tresolution::tresolution(const config& cfg)
+button_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in button.hpp.
diff --git a/src/gui/widgets/button.hpp b/src/gui/widgets/button.hpp
index 49cf6f036ac..b7575da4795 100644
--- a/src/gui/widgets/button.hpp
+++ b/src/gui/widgets/button.hpp
@@ -120,9 +120,9 @@ struct button_definition : public control_definition
 {
 	explicit button_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/chatbox.cpp b/src/gui/widgets/chatbox.cpp
index 24cf55c1b5b..a822004f649 100644
--- a/src/gui/widgets/chatbox.cpp
+++ b/src/gui/widgets/chatbox.cpp
@@ -67,12 +67,12 @@ chatbox::chatbox()
 
 void chatbox::active_window_changed()
 {
-	tlobby_chat_window& t = open_windows_[active_window_];
+	lobby_chat_window& t = open_windows_[active_window_];
 
 	// Clear pending messages notification in room listbox
 	grid* grid = roomlistbox_->get_row_grid(active_window_);
 
-	find_widget<image>(grid, "pending_messages", false).set_visible(widget::tvisible::hidden);
+	find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::hidden);
 
 	t.pending_messages = 0;
 
@@ -81,7 +81,7 @@ void chatbox::active_window_changed()
 	}
 }
 
-void chatbox::switch_to_window(tlobby_chat_window* t)
+void chatbox::switch_to_window(lobby_chat_window* t)
 {
 	switch_to_window(t - &open_windows_[0]);
 }
@@ -126,7 +126,7 @@ void chatbox::send_message_button_callback()
 		//      the other party without having to specify it's nick.
 		chat_handler::do_speak(input);
 	} else {
-		tlobby_chat_window& t = open_windows_[active_window_];
+		lobby_chat_window& t = open_windows_[active_window_];
 
 		if(t.whisper) {
 			send_whisper(t.name, input);
@@ -258,7 +258,7 @@ void chatbox::add_whisper_sent(const std::string& receiver, const std::string& m
 {
 	if(whisper_window_active(receiver)) {
 		add_active_window_message(preferences::login(), message, true);
-	} else if(tlobby_chat_window* t = whisper_window_open(receiver, preferences::auto_open_whisper_windows())) {
+	} else if(lobby_chat_window* t = whisper_window_open(receiver, preferences::auto_open_whisper_windows())) {
 		switch_to_window(t);
 		add_active_window_message(preferences::login(), message, true);
 	} else {
@@ -297,7 +297,7 @@ void chatbox::add_whisper_received(const std::string& sender, const std::string&
 void chatbox::add_chat_room_message_sent(const std::string& room,
 	const std::string& message)
 {
-	tlobby_chat_window* t = room_window_open(room, false);
+	lobby_chat_window* t = room_window_open(room, false);
 	if(!t) {
 		LOG_LB << "Cannot add sent message to ui for room " << room << ", player not in the room\n";
 		return;
@@ -325,7 +325,7 @@ void chatbox::add_chat_room_message_received(const std::string& room,
 		return;
 	}
 
-	t_notify_mode notify_mode = NOTIFY_NONE;
+	notify_mode notify_mode = NOTIFY_NONE;
 	ri->log().add_message(speaker, message);
 
 	if(room_window_active(room)) {
@@ -350,27 +350,27 @@ void chatbox::add_chat_room_message_received(const std::string& room,
 
 bool chatbox::whisper_window_active(const std::string& name)
 {
-	const tlobby_chat_window& t = open_windows_[active_window_];
+	const lobby_chat_window& t = open_windows_[active_window_];
 	return t.name == name && t.whisper == true;
 }
 
 bool chatbox::room_window_active(const std::string& room)
 {
-	const tlobby_chat_window& t = open_windows_[active_window_];
+	const lobby_chat_window& t = open_windows_[active_window_];
 	return t.name == room && t.whisper == false;
 }
 
-tlobby_chat_window* chatbox::room_window_open(const std::string& room, const bool open_new, const bool allow_close)
+lobby_chat_window* chatbox::room_window_open(const std::string& room, const bool open_new, const bool allow_close)
 {
 	return search_create_window(room, false, open_new, allow_close);
 }
 
-tlobby_chat_window* chatbox::whisper_window_open(const std::string& name, bool open_new)
+lobby_chat_window* chatbox::whisper_window_open(const std::string& name, bool open_new)
 {
 	return search_create_window(name, true, open_new, true);
 }
 
-tlobby_chat_window* chatbox::search_create_window(const std::string& name,
+lobby_chat_window* chatbox::search_create_window(const std::string& name,
 	const bool whisper,
 	const bool open_new,
 	const bool allow_close)
@@ -385,7 +385,7 @@ tlobby_chat_window* chatbox::search_create_window(const std::string& name,
 		return nullptr;
 	}
 
-	open_windows_.push_back(tlobby_chat_window(name, whisper));
+	open_windows_.push_back(lobby_chat_window(name, whisper));
 
 	std::map<std::string, string_map> data;
 	string_map item;
@@ -417,15 +417,15 @@ tlobby_chat_window* chatbox::search_create_window(const std::string& name,
 		std::bind(&chatbox::close_window_button_callback, this, open_windows_.back(), _3, _4));
 
 	if(!allow_close) {
-		close_button.set_visible(control::tvisible::hidden);
+		close_button.set_visible(control::visibility::hidden);
 	}
 
 	return &open_windows_.back();
 }
 
-void chatbox::close_window_button_callback(tlobby_chat_window& chat_window, bool& handled, bool& halt)
+void chatbox::close_window_button_callback(lobby_chat_window& chat_window, bool& handled, bool& halt)
 {
-	const int index = std::find_if(open_windows_.begin(), open_windows_.end(), [&chat_window](const tlobby_chat_window& room) {
+	const int index = std::find_if(open_windows_.begin(), open_windows_.end(), [&chat_window](const lobby_chat_window& room) {
 		return room.name == chat_window.name;
 	}) - open_windows_.begin();
 
@@ -444,7 +444,7 @@ void chatbox::send_to_server(const ::config& cfg)
 
 void chatbox::increment_waiting_whsipers(const std::string& name)
 {
-	if(tlobby_chat_window* t = whisper_window_open(name, false)) {
+	if(lobby_chat_window* t = whisper_window_open(name, false)) {
 		t->pending_messages++;
 		if(t->pending_messages == 1) {
 			DBG_LB << "do whisper pending mark row " << (t - &open_windows_[0]) << " with " << t->name << "\n";
@@ -453,14 +453,14 @@ void chatbox::increment_waiting_whsipers(const std::string& name)
 			// label& label = grid->get_widget<label>("room", false);
 			// label.set_use_markup(true);
 			// label.set_label(colorize("<" + t->name + ">", "red"));
-			find_widget<image>(grid, "pending_messages", false).set_visible(widget::tvisible::visible);
+			find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::visible);
 		}
 	}
 }
 
 void chatbox::increment_waiting_messages(const std::string& room)
 {
-	if(tlobby_chat_window* t = room_window_open(room, false)) {
+	if(lobby_chat_window* t = room_window_open(room, false)) {
 		t->pending_messages++;
 		if(t->pending_messages == 1) {
 			int idx = t - &open_windows_[0];
@@ -470,14 +470,14 @@ void chatbox::increment_waiting_messages(const std::string& room)
 			// label& label = grid->get_widget<label>("room", false);
 			// label.set_use_markup(true);
 			// label.set_label(colorize(t->name, "red"));
-			find_widget<image>(grid, "pending_messages", false).set_visible(widget::tvisible::visible);
+			find_widget<image>(grid, "pending_messages", false).set_visible(widget::visibility::visible);
 		}
 	}
 }
 
 void chatbox::add_whisper_window_whisper(const std::string& sender, const std::string& message)
 {
-	tlobby_chat_window* t = whisper_window_open(sender, false);
+	lobby_chat_window* t = whisper_window_open(sender, false);
 	if(!t) {
 		ERR_LB << "Whisper window not open in add_whisper_window_whisper for " << sender << "\n";
 		return;
@@ -497,7 +497,7 @@ void chatbox::add_active_window_whisper(const std::string& sender,
 
 void chatbox::close_window(size_t idx)
 {
-	const tlobby_chat_window& t = open_windows_[idx];
+	const lobby_chat_window& t = open_windows_[idx];
 	bool active_changed = idx == active_window_;
 	DBG_LB << "Close window " << idx << " - " << t.name << "\n";
 
@@ -541,7 +541,7 @@ void chatbox::add_room_window_message(const std::string& room,
 	const std::string& sender,
 	const std::string& message)
 {
-	tlobby_chat_window* t = room_window_open(room, false);
+	lobby_chat_window* t = room_window_open(room, false);
 	if(!t) {
 		ERR_LB << "Room window not open in add_room_window_message for " << room << "\n";
 		return;
@@ -562,7 +562,7 @@ void chatbox::add_active_window_message(const std::string& sender,
 
 room_info* chatbox::active_window_room()
 {
-	const tlobby_chat_window& t = open_windows_[active_window_];
+	const lobby_chat_window& t = open_windows_[active_window_];
 	if(t.whisper) {
 		return nullptr;
 	}
@@ -595,7 +595,7 @@ void chatbox::process_room_join(const ::config& data)
 		}
 	} else {
 		if(player == preferences::login()) {
-			tlobby_chat_window* t = room_window_open(room, true);
+			lobby_chat_window* t = room_window_open(room, true);
 			lobby_info().open_room(room);
 			r = lobby_info().get_room(room);
 			assert(r);
@@ -733,10 +733,10 @@ bool chatbox::process_network_data(const ::config& data)
 chatbox_definition::chatbox_definition(const config& cfg)
 	: control_definition(cfg)
 {
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
-chatbox_definition::tresolution::tresolution(const config& cfg)
+chatbox_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid()
 {
 	state.push_back(state_definition(cfg.child("background")));
@@ -766,9 +766,9 @@ widget* builder_chatbox::build() const
 	DBG_GUI_G << "Window builder: placed unit preview pane '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const chatbox_definition::tresolution> conf
+	std::shared_ptr<const chatbox_definition::resolution> conf
 		= std::static_pointer_cast<
-			const chatbox_definition::tresolution>(widget->config());
+			const chatbox_definition::resolution>(widget->config());
 
 	assert(conf);
 
diff --git a/src/gui/widgets/chatbox.hpp b/src/gui/widgets/chatbox.hpp
index 4a9cd46a254..2ac17f85f5f 100644
--- a/src/gui/widgets/chatbox.hpp
+++ b/src/gui/widgets/chatbox.hpp
@@ -41,9 +41,9 @@ namespace implementation
 }
 
 
-struct tlobby_chat_window
+struct lobby_chat_window
 {
-	tlobby_chat_window(const std::string& name, bool whisper)
+	lobby_chat_window(const std::string& name, bool whisper)
 		: name(name), whisper(whisper), pending_messages(0)
 	{
 	}
@@ -119,7 +119,7 @@ private:
 
 	text_box* chat_input_;
 
-	std::vector<tlobby_chat_window> open_windows_;
+	std::vector<lobby_chat_window> open_windows_;
 
 	size_t active_window_;
 
@@ -205,7 +205,7 @@ public:
 	* Switch to the window given by a valid pointer (e.g. received from a call
 	* to *_window_open)
 	*/
-	void switch_to_window(tlobby_chat_window* t);
+	void switch_to_window(lobby_chat_window* t);
 
 	void switch_to_window(size_t id);
 
@@ -223,7 +223,7 @@ public:
 	* 'close' button will be disabled.
 	* @return valid ptr if the window was found or added, null otherwise
 	*/
-	tlobby_chat_window* room_window_open(const std::string& room,
+	lobby_chat_window* room_window_open(const std::string& room,
 		const bool open_new, const bool allow_close = true);
 
 	/**
@@ -231,18 +231,18 @@ public:
 	* then it will be created if not found.
 	* @return valid ptr if the window was found or added, null otherwise
 	*/
-	tlobby_chat_window* whisper_window_open(const std::string& name,
+	lobby_chat_window* whisper_window_open(const std::string& name,
 		bool open_new);
 
 	/**
 	* Helper function to find and open a new window, used by *_window_open
 	*/
-	tlobby_chat_window* search_create_window(const std::string& name, const bool whisper, const bool open_new, const bool allow_close);
+	lobby_chat_window* search_create_window(const std::string& name, const bool whisper, const bool open_new, const bool allow_close);
 
-	void do_notify(t_notify_mode mode) { do_notify(mode, "", ""); }
-	void do_notify(t_notify_mode mode, const std::string & sender, const std::string & message) { do_mp_notify(mode, sender, message); }
+	void do_notify(notify_mode mode) { do_notify(mode, "", ""); }
+	void do_notify(notify_mode mode, const std::string & sender, const std::string & message) { do_mp_notify(mode, sender, message); }
 
-	void close_window_button_callback(tlobby_chat_window& chat_window, bool& handled, bool& halt);
+	void close_window_button_callback(lobby_chat_window& chat_window, bool& handled, bool& halt);
 
 
 	void process_room_join(const ::config& data);
@@ -263,9 +263,9 @@ struct chatbox_definition : public control_definition
 
 	explicit chatbox_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp
index 11e8582772c..f330c6c6e9d 100644
--- a/src/gui/widgets/container.cpp
+++ b/src/gui/widgets/container.cpp
@@ -141,8 +141,8 @@ void container_base::impl_draw_children(surface& frame_buffer,
 									 int x_offset,
 									 int y_offset)
 {
-	assert(get_visible() == widget::tvisible::visible
-		   && grid_.get_visible() == widget::tvisible::visible);
+	assert(get_visible() == widget::visibility::visible
+		   && grid_.get_visible() == widget::visibility::visible);
 
 	grid_.draw_children(frame_buffer, x_offset, y_offset);
 }
diff --git a/src/gui/widgets/control.cpp b/src/gui/widgets/control.cpp
index f8fcd397853..3bf0e54adc6 100644
--- a/src/gui/widgets/control.cpp
+++ b/src/gui/widgets/control.cpp
@@ -137,7 +137,7 @@ void control::set_members(const string_map& data)
 
 bool control::disable_click_dismiss() const
 {
-	return get_visible() == widget::tvisible::visible && get_active();
+	return get_visible() == widget::visibility::visible && get_active();
 }
 
 iterator::walker_base* control::create_walker()
diff --git a/src/gui/widgets/debug.cpp b/src/gui/widgets/debug.cpp
index 5a84740ff86..c3bd5782c76 100644
--- a/src/gui/widgets/debug.cpp
+++ b/src/gui/widgets/debug.cpp
@@ -442,7 +442,7 @@ void debug_layout_graph::grid_generate_info(std::ostream& out,
 }
 
 void debug_layout_graph::child_generate_info(std::ostream& out,
-											  const grid::tchild& child,
+											  const grid::child& child,
 											  const std::string& id) const
 {
 	assert(!id.empty());
diff --git a/src/gui/widgets/debug.hpp b/src/gui/widgets/debug.hpp
index f4fd305bdc5..14940c35d5e 100644
--- a/src/gui/widgets/debug.hpp
+++ b/src/gui/widgets/debug.hpp
@@ -171,7 +171,7 @@ private:
 	 * @param id                  The dof-file-id of the child.
 	 */
 	void child_generate_info(std::ostream& out,
-							 const grid::tchild& child,
+							 const grid::child& child,
 							 const std::string& id) const;
 
 	/***** ***** Helper ***** *****/
diff --git a/src/gui/widgets/drawing.cpp b/src/gui/widgets/drawing.cpp
index 2e2622298f9..009f54f7f20 100644
--- a/src/gui/widgets/drawing.cpp
+++ b/src/gui/widgets/drawing.cpp
@@ -70,7 +70,7 @@ drawing_definition::drawing_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing drawing " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -97,7 +97,7 @@ drawing_definition::drawing_definition(const config& cfg)
  * @end{tag}{name="drawing_definition"}
  * @end{parent}{name="gui/"}
  */
-drawing_definition::tresolution::tresolution(const config& cfg)
+drawing_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	/*
diff --git a/src/gui/widgets/drawing.hpp b/src/gui/widgets/drawing.hpp
index da3fcffa1a9..486d53be6e3 100644
--- a/src/gui/widgets/drawing.hpp
+++ b/src/gui/widgets/drawing.hpp
@@ -91,9 +91,9 @@ struct drawing_definition : public control_definition
 {
 	explicit drawing_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/generator_private.hpp b/src/gui/widgets/generator_private.hpp
index 60768905e2b..cd8bded0996 100644
--- a/src/gui/widgets/generator_private.hpp
+++ b/src/gui/widgets/generator_private.hpp
@@ -22,7 +22,7 @@
 #include "gui/widgets/selectable.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/toggle_panel.hpp"
-#include "gui/widgets/window.hpp" // For window::tvisible
+#include "gui/widgets/window.hpp" // For window::visibility
 #include "wml_exception.hpp"
 
 namespace gui2
@@ -527,8 +527,8 @@ struct show : public virtual generator_base
 {
 	void select(grid& grid, const bool show)
 	{
-		grid.set_visible(show ? widget::tvisible::visible
-							  : widget::tvisible::hidden);
+		grid.set_visible(show ? widget::visibility::visible
+							  : widget::visibility::hidden);
 	}
 
 	/**
@@ -651,8 +651,8 @@ public:
 			/*** Set the proper visible state. ***/
 			items_[index]->shown = show;
 			items_[index]
-					->grid.set_visible(show ? widget::tvisible::visible
-											: widget::tvisible::invisible);
+					->grid.set_visible(show ? widget::visibility::visible
+											: widget::visibility::invisible);
 
 			/*** Update the selection. ***/
 			minimum_selection::set_item_shown(index, show);
@@ -663,7 +663,7 @@ public:
 	virtual bool get_item_shown(const unsigned index) const override
 	{
 		assert(index < items_.size());
-		return items_[index]->shown && items_[index]->grid.get_visible() != window::tvisible::invisible;
+		return items_[index]->shown && items_[index]->grid.get_visible() != window::visibility::invisible;
 	}
 
 
@@ -755,7 +755,7 @@ public:
 		assert(list_builder);
 		assert(index == -1 || static_cast<unsigned>(index) < items_.size());
 
-		titem* item = new titem;
+		child* item = new child;
 		list_builder->build(&item->grid);
 		init(&item->grid, item_data, callback);
 
@@ -796,7 +796,7 @@ public:
 	{
 		for(auto item : items_)
 		{
-			if(item->grid.get_visible() != widget::tvisible::invisible
+			if(item->grid.get_visible() != widget::visibility::invisible
 			   && item->shown) {
 
 				item->grid.layout_initialise(full_initialisation);
@@ -851,12 +851,12 @@ public:
 									int x_offset,
 									int y_offset) override
 	{
-		assert(this->get_visible() == widget::tvisible::visible);
+		assert(this->get_visible() == widget::visibility::visible);
 		calculate_order();
 		for(auto index : order_)
 		{
-			titem* item = items_[index];
-			if(item->grid.get_visible() == widget::tvisible::visible
+			child* item = items_[index];
+			if(item->grid.get_visible() == widget::visibility::visible
 			   && item->shown) {
 
 				item->grid.draw_children(frame_buffer, x_offset, y_offset);
@@ -959,10 +959,10 @@ protected:
 
 private:
 	/** Definition of an item. */
-	struct titem
+	struct child
 	{
 
-		titem() : grid(), selected(false), shown(true), ordered_index(0)
+		child() : grid(), selected(false), shown(true), ordered_index(0)
 		{
 		}
 
@@ -993,8 +993,8 @@ private:
 	int last_selected_item_;
 
 	/** The items in the generator. */
-	typedef std::vector<titem*> titems;
-	titems items_;
+	typedef std::vector<child*> child_list;
+	child_list items_;
 
 	/** the elements of order_ are indexes to items_ */
 	mutable std::vector<size_t> order_;
@@ -1015,9 +1015,9 @@ private:
 	struct calculate_order_helper
 	{
 		const torder_func& order_func_;
-		const titems& items_;
+		const child_list& items_;
 
-		calculate_order_helper(const torder_func& order_func, const titems& items)
+		calculate_order_helper(const torder_func& order_func, const child_list& items)
 			: order_func_(order_func)
 			, items_(items)
 		{
diff --git a/src/gui/widgets/grid.cpp b/src/gui/widgets/grid.cpp
index 493430de00a..6864605bdc2 100644
--- a/src/gui/widgets/grid.cpp
+++ b/src/gui/widgets/grid.cpp
@@ -28,7 +28,7 @@
 #define LOG_IMPL_HEADER "grid [" + grid.id() + "] " + __func__ + ':'
 
 #define LOG_CHILD_SCOPE_HEADER                                                 \
-	"grid::tchild [" + (widget_ ? widget_->id() : "-") + "] " + __func__
+	"grid::child [" + (widget_ ? widget_->id() : "-") + "] " + __func__
 #define LOG_CHILD_HEADER LOG_CHILD_SCOPE_HEADER + ':'
 
 namespace gui2
@@ -76,7 +76,7 @@ void grid::set_child(widget* widget,
 	assert(flags & VERTICAL_MASK);
 	assert(flags & HORIZONTAL_MASK);
 
-	tchild& cell = child(row, col);
+	child& cell = get_child(row, col);
 
 	// clear old child if any
 	if(cell.get_widget()) {
@@ -141,7 +141,7 @@ void grid::remove_child(const unsigned row, const unsigned col)
 {
 	assert(row < rows_ && col < cols_);
 
-	tchild& cell = child(row, col);
+	child& cell = get_child(row, col);
 
 	if(cell.get_widget()) {
 		delete cell.get_widget();
@@ -398,7 +398,7 @@ point grid::calculate_best_size() const
 	for(unsigned row = 0; row < rows_; ++row) {
 		for(unsigned col = 0; col < cols_; ++col) {
 
-			const point size = child(row, col).get_best_size();
+			const point size = get_child(row, col).get_best_size();
 
 			if(size.x > static_cast<int>(col_width_[col])) {
 				col_width_[col] = size.x;
@@ -645,7 +645,7 @@ bool grid::has_widget(const widget& widget) const
 
 bool grid::disable_click_dismiss() const
 {
-	if(get_visible() != widget::tvisible::visible) {
+	if(get_visible() != widget::visibility::visible) {
 		return false;
 	}
 
@@ -702,7 +702,7 @@ void grid::set_rows_cols(const unsigned rows, const unsigned cols)
 	children_.resize(rows_ * cols_);
 }
 
-point grid::tchild::get_best_size() const
+point grid::child::get_best_size() const
 {
 	log_scope2(log_gui_layout, LOG_CHILD_SCOPE_HEADER)
 
@@ -712,7 +712,7 @@ point grid::tchild::get_best_size() const
 		return border_space();
 	}
 
-	if(widget_->get_visible() == widget::tvisible::invisible) {
+	if(widget_->get_visible() == widget::visibility::invisible) {
 		DBG_GUI_L << LOG_CHILD_HEADER << " has widget " << true
 				  << " widget visible " << false << " returning 0,0"
 				  << ".\n";
@@ -727,10 +727,10 @@ point grid::tchild::get_best_size() const
 	return best_size;
 }
 
-void grid::tchild::place(point origin, point size)
+void grid::child::place(point origin, point size)
 {
 	assert(get_widget());
-	if(get_widget()->get_visible() == widget::tvisible::invisible) {
+	if(get_widget()->get_visible() == widget::visibility::invisible) {
 		return;
 	}
 
@@ -855,22 +855,22 @@ void grid::tchild::place(point origin, point size)
 	get_widget()->place(widget_orig, widget_size);
 }
 
-void grid::tchild::layout_initialise(const bool full_initialisation)
+void grid::child::layout_initialise(const bool full_initialisation)
 {
 	assert(widget_);
 
-	if(widget_->get_visible() != widget::tvisible::invisible) {
+	if(widget_->get_visible() != widget::visibility::invisible) {
 		widget_->layout_initialise(full_initialisation);
 	}
 }
 
-const std::string& grid::tchild::id() const
+const std::string& grid::child::id() const
 {
 	assert(widget_);
 	return widget_->id();
 }
 
-point grid::tchild::border_space() const
+point grid::child::border_space() const
 {
 	point result(0, 0);
 
@@ -901,8 +901,8 @@ void grid::layout(const point& origin)
 					  << " at origin " << orig << " with size " << size
 					  << ".\n";
 
-			if(child(row, col).get_widget()) {
-				child(row, col).place(orig, size);
+			if(get_child(row, col).get_widget()) {
+				get_child(row, col).place(orig, size);
 			}
 
 			orig.x += col_width_[col];
@@ -924,7 +924,7 @@ void grid::impl_draw_children(surface& frame_buffer, int x_offset, int y_offset)
 	 * the area not used for resizing the screen, this call `fixes' that.
 	 */
 
-	assert(get_visible() == widget::tvisible::visible);
+	assert(get_visible() == widget::visibility::visible);
 	set_is_dirty(false);
 
 	for(auto & child : children_)
@@ -933,11 +933,11 @@ void grid::impl_draw_children(surface& frame_buffer, int x_offset, int y_offset)
 		widget* widget = child.get_widget();
 		assert(widget);
 
-		if(widget->get_visible() != widget::tvisible::visible) {
+		if(widget->get_visible() != widget::visibility::visible) {
 			continue;
 		}
 
-		if(widget->get_drawing_action() == widget::tredraw_action::none) {
+		if(widget->get_drawing_action() == widget::redraw_action::none) {
 			continue;
 		}
 
@@ -955,7 +955,7 @@ unsigned grid_implementation::row_request_reduce_height(
 	unsigned required_height = 0;
 
 	for(size_t x = 0; x < grid.cols_; ++x) {
-		grid::tchild& cell = grid.child(row, x);
+		grid::child& cell = grid.get_child(row, x);
 		cell_request_reduce_height(cell, maximum_height);
 
 		const point size(cell.get_best_size());
@@ -980,7 +980,7 @@ unsigned grid_implementation::column_request_reduce_width(
 	unsigned required_width = 0;
 
 	for(size_t y = 0; y < grid.rows_; ++y) {
-		grid::tchild& cell = grid.child(y, column);
+		grid::child& cell = grid.get_child(y, column);
 		cell_request_reduce_width(cell, maximum_width);
 
 		const point size(cell.get_best_size());
@@ -999,12 +999,12 @@ unsigned grid_implementation::column_request_reduce_width(
 }
 
 void
-grid_implementation::cell_request_reduce_height(grid::tchild& child,
+grid_implementation::cell_request_reduce_height(grid::child& child,
 												 const unsigned maximum_height)
 {
 	assert(child.widget_);
 
-	if(child.widget_->get_visible() == widget::tvisible::invisible) {
+	if(child.widget_->get_visible() == widget::visibility::invisible) {
 		return;
 	}
 
@@ -1013,12 +1013,12 @@ grid_implementation::cell_request_reduce_height(grid::tchild& child,
 }
 
 void
-grid_implementation::cell_request_reduce_width(grid::tchild& child,
+grid_implementation::cell_request_reduce_width(grid::child& child,
 												const unsigned maximum_width)
 {
 	assert(child.widget_);
 
-	if(child.widget_->get_visible() == widget::tvisible::invisible) {
+	if(child.widget_->get_visible() == widget::visibility::invisible) {
 		return;
 	}
 
diff --git a/src/gui/widgets/grid.hpp b/src/gui/widgets/grid.hpp
index 2354b0b61dd..9dd8d1035e6 100644
--- a/src/gui/widgets/grid.hpp
+++ b/src/gui/widgets/grid.hpp
@@ -175,13 +175,13 @@ public:
 	/** Returns the widget in the selected cell. */
 	const widget* get_widget(const unsigned row, const unsigned col) const
 	{
-		return child(row, col).get_widget();
+		return get_child(row, col).get_widget();
 	}
 
 	/** Returns the widget in the selected cell. */
 	widget* get_widget(const unsigned row, const unsigned col)
 	{
-		return child(row, col).get_widget();
+		return get_child(row, col).get_widget();
 	}
 
 	virtual bool can_mouse_focus() const override { return false; }
@@ -306,12 +306,12 @@ public:
 
 private:
 	/** Child item of the grid. */
-	class tchild
+	class child
 	{
 		friend struct grid_implementation;
 
 	public:
-		tchild() : flags_(0), border_size_(0), widget_(nullptr)
+		child() : flags_(0), border_size_(0), widget_(nullptr)
 
 		// Fixme make a class where we can store some properties in the cache
 		// regarding size etc.
@@ -394,15 +394,15 @@ private:
 		/** Returns the space needed for the border. */
 		point border_space() const;
 
-	}; // class tchild
+	}; // class child
 
 public:
-	/** Iterator for the tchild items. */
+	/** Iterator for the child items. */
 	class iterator
 	{
 
 	public:
-		iterator(std::vector<tchild>::iterator itor) : itor_(itor)
+		iterator(std::vector<child>::iterator itor) : itor_(itor)
 		{
 		}
 
@@ -434,7 +434,7 @@ public:
 		}
 
 	private:
-		std::vector<tchild>::iterator itor_;
+		std::vector<child>::iterator itor_;
 	};
 
 	iterator begin()
@@ -473,12 +473,12 @@ private:
 	 * All children are stored in a 1D vector and the formula to access a cell
 	 * is: rows_ * col + row. All other vectors use the same access formula.
 	 */
-	std::vector<tchild> children_;
-	const tchild& child(const unsigned row, const unsigned col) const
+	std::vector<child> children_;
+	const child& get_child(const unsigned row, const unsigned col) const
 	{
 		return children_[rows_ * col + row];
 	}
-	tchild& child(const unsigned row, const unsigned col)
+	child& get_child(const unsigned row, const unsigned col)
 	{
 		return children_[rows_ * col + row];
 	}
diff --git a/src/gui/widgets/grid_private.hpp b/src/gui/widgets/grid_private.hpp
index 4eb78d4e3e3..a1d440872bf 100644
--- a/src/gui/widgets/grid_private.hpp
+++ b/src/gui/widgets/grid_private.hpp
@@ -56,7 +56,7 @@ struct grid_implementation
 					  const point& coordinate,
 					  const bool must_be_active)
 	{
-		typedef typename utils::const_clone<grid::tchild, W>::type hack;
+		typedef typename utils::const_clone<grid::child, W>::type hack;
 		for(hack & child : grid.children_)
 		{
 
@@ -92,7 +92,7 @@ struct grid_implementation
 			return widget;
 		}
 
-		typedef typename utils::const_clone<grid::tchild, W>::type hack;
+		typedef typename utils::const_clone<grid::child, W>::type hack;
 		for(hack & child : grid.children_)
 		{
 
@@ -143,7 +143,7 @@ private:
 	 * @param child               The cell whose widget needs to be resized.
 	 * @param maximum_height      The wanted maximum height.
 	 */
-	static void cell_request_reduce_height(grid::tchild& child,
+	static void cell_request_reduce_height(grid::child& child,
 										   const unsigned maximum_height);
 
 	/**
@@ -152,7 +152,7 @@ private:
 	 * @param child               The cell whose widget needs to be resized.
 	 * @param maximum_width      The wanted maximum width.
 	 */
-	static void cell_request_reduce_width(grid::tchild& child,
+	static void cell_request_reduce_width(grid::child& child,
 										  const unsigned maximum_width);
 };
 
diff --git a/src/gui/widgets/horizontal_scrollbar.cpp b/src/gui/widgets/horizontal_scrollbar.cpp
index 15086b29888..1b2f2a1ebff 100644
--- a/src/gui/widgets/horizontal_scrollbar.cpp
+++ b/src/gui/widgets/horizontal_scrollbar.cpp
@@ -35,9 +35,9 @@ REGISTER_WIDGET(horizontal_scrollbar)
 
 unsigned horizontal_scrollbar::minimum_positioner_length() const
 {
-	std::shared_ptr<const horizontal_scrollbar_definition::tresolution>
+	std::shared_ptr<const horizontal_scrollbar_definition::resolution>
 	conf = std::static_pointer_cast<const horizontal_scrollbar_definition::
-											   tresolution>(config());
+											   resolution>(config());
 
 	assert(conf);
 	return conf->minimum_positioner_length;
@@ -45,9 +45,9 @@ unsigned horizontal_scrollbar::minimum_positioner_length() const
 
 unsigned horizontal_scrollbar::maximum_positioner_length() const
 {
-	std::shared_ptr<const horizontal_scrollbar_definition::tresolution>
+	std::shared_ptr<const horizontal_scrollbar_definition::resolution>
 	conf = std::static_pointer_cast<const horizontal_scrollbar_definition::
-											   tresolution>(config());
+											   resolution>(config());
 
 	assert(conf);
 	return conf->maximum_positioner_length;
@@ -55,9 +55,9 @@ unsigned horizontal_scrollbar::maximum_positioner_length() const
 
 unsigned horizontal_scrollbar::offset_before() const
 {
-	std::shared_ptr<const horizontal_scrollbar_definition::tresolution>
+	std::shared_ptr<const horizontal_scrollbar_definition::resolution>
 	conf = std::static_pointer_cast<const horizontal_scrollbar_definition::
-											   tresolution>(config());
+											   resolution>(config());
 
 	assert(conf);
 	return conf->left_offset;
@@ -65,9 +65,9 @@ unsigned horizontal_scrollbar::offset_before() const
 
 unsigned horizontal_scrollbar::offset_after() const
 {
-	std::shared_ptr<const horizontal_scrollbar_definition::tresolution>
+	std::shared_ptr<const horizontal_scrollbar_definition::resolution>
 	conf = std::static_pointer_cast<const horizontal_scrollbar_definition::
-											   tresolution>(config());
+											   resolution>(config());
 	assert(conf);
 
 	return conf->right_offset;
@@ -121,7 +121,7 @@ horizontal_scrollbar_definition::horizontal_scrollbar_definition(
 {
 	DBG_GUI_P << "Parsing horizontal scrollbar " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -172,7 +172,7 @@ horizontal_scrollbar_definition::horizontal_scrollbar_definition(
  * @end{tag}{name="horizontal_scrollbar_definition"}
  * @end{parent}{name="gui/"}
  */
-horizontal_scrollbar_definition::tresolution::tresolution(const config& cfg)
+horizontal_scrollbar_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, minimum_positioner_length(cfg["minimum_positioner_length"])
 	, maximum_positioner_length(cfg["maximum_positioner_length"])
diff --git a/src/gui/widgets/horizontal_scrollbar.hpp b/src/gui/widgets/horizontal_scrollbar.hpp
index 05005e81e74..1d7eadf90ac 100644
--- a/src/gui/widgets/horizontal_scrollbar.hpp
+++ b/src/gui/widgets/horizontal_scrollbar.hpp
@@ -77,9 +77,9 @@ struct horizontal_scrollbar_definition : public control_definition
 {
 	explicit horizontal_scrollbar_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		unsigned minimum_positioner_length;
 		unsigned maximum_positioner_length;
diff --git a/src/gui/widgets/image.cpp b/src/gui/widgets/image.cpp
index 2ff9f9670c5..daebb3f6f84 100644
--- a/src/gui/widgets/image.cpp
+++ b/src/gui/widgets/image.cpp
@@ -103,7 +103,7 @@ image_definition::image_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing image " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -129,7 +129,7 @@ image_definition::image_definition(const config& cfg)
  * @end{tag}{name="image_definition"}
  * @end{parent}{name="gui/"}
  */
-image_definition::tresolution::tresolution(const config& cfg)
+image_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in image.hpp.
diff --git a/src/gui/widgets/image.hpp b/src/gui/widgets/image.hpp
index 0b80cce29c9..35a31e9c656 100644
--- a/src/gui/widgets/image.hpp
+++ b/src/gui/widgets/image.hpp
@@ -103,9 +103,9 @@ struct image_definition : public control_definition
 {
 	explicit image_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 63cae4b981c..f9ca9c7f0af 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -138,8 +138,8 @@ void label::load_config_extra()
 {
 	assert(config());
 
-	std::shared_ptr<const label_definition::tresolution>
-	conf = std::static_pointer_cast<const label_definition::tresolution>(
+	std::shared_ptr<const label_definition::resolution>
+	conf = std::static_pointer_cast<const label_definition::resolution>(
 			config());
 
 	assert(conf);
@@ -220,7 +220,7 @@ label_definition::label_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing label " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -261,7 +261,7 @@ label_definition::label_definition(const config& cfg)
  * @end{tag}{name="label_definition"}
  * @end{parent}{name="gui/"}
  */
-label_definition::tresolution::tresolution(const config& cfg)
+label_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, link_aware(cfg["link_aware"].to_bool(false))
 	, link_color(cfg["link_color"].str().size() > 0 ? cfg["link_color"].str() : "#ffff00")
diff --git a/src/gui/widgets/label.hpp b/src/gui/widgets/label.hpp
index 41533d6f5f0..492b10bf5a3 100644
--- a/src/gui/widgets/label.hpp
+++ b/src/gui/widgets/label.hpp
@@ -138,9 +138,9 @@ struct label_definition : public control_definition
 
 	explicit label_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		bool link_aware;
 		std::string link_color;
diff --git a/src/gui/widgets/list.cpp b/src/gui/widgets/list.cpp
index 6fc34468348..3e9f022e2e5 100644
--- a/src/gui/widgets/list.cpp
+++ b/src/gui/widgets/list.cpp
@@ -140,7 +140,7 @@ void list_view::remove_row(const unsigned row, unsigned count)
 
 	unsigned height_reduced = 0;
 	for(; count; --count) {
-		if(generator_->item(row).get_visible() != tvisible::invisible) {
+		if(generator_->item(row).get_visible() != visibility::invisible) {
 			height_reduced += generator_->item(row).get_height();
 		}
 		generator_->delete_item(row);
@@ -181,7 +181,7 @@ void list_view::set_row_shown(const unsigned row, const bool shown)
 
 	bool resize_needed = false;
 	{
-		window::tinvalidate_layout_blocker invalidate_layout_blocker(*window);
+		window::invalidate_layout_blocker invalidate_layout_blocker(*window);
 
 		generator_->set_item_shown(row, shown);
 		generator_->place(generator_->get_origin(),
@@ -213,7 +213,7 @@ void list_view::set_row_shown(const boost::dynamic_bitset<>& shown)
 
 	bool resize_needed = false;
 	{
-		window::tinvalidate_layout_blocker invalidate_layout_blocker(*window);
+		window::invalidate_layout_blocker invalidate_layout_blocker(*window);
 
 		for(size_t i = 0; i < shown.size(); ++i) {
 			generator_->set_item_shown(i, shown[i]);
@@ -325,7 +325,7 @@ void list_view::resize_content(
 
 void list_view::init()
 {
-	init_grid(cast<listbox_definition::tresolution>(config()).grid);
+	init_grid(cast<listbox_definition::resolution>(config()).grid);
 
 	set_single_child(find_widget<grid>(&grid(), "_list_grid", false),
 					 generator_);
@@ -336,19 +336,19 @@ void list_view::init()
 	 */
 	grid* g = find_widget<grid>(&grid(), "_header_grid", false, false);
 	if(g)
-		g->set_visible(widget::tvisible::invisible);
+		g->set_visible(widget::visibility::invisible);
 
 	g = find_widget<grid>(&grid(), "_footer_grid", false, false);
 	if(g)
-		g->set_visible(widget::tvisible::invisible);
+		g->set_visible(widget::visibility::invisible);
 
 	g = find_widget<grid>(&grid(), "_vertical_scrollbar_grid", false, false);
 	if(g)
-		g->set_visible(widget::tvisible::invisible);
+		g->set_visible(widget::visibility::invisible);
 
 	g = find_widget<grid>(&grid(), "_horizontal_scrollbar_grid", false, false);
 	if(g)
-		g->set_visible(widget::tvisible::invisible);
+		g->set_visible(widget::visibility::invisible);
 }
 
 bool list_view::get_active() const
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ecf78548bef..14f7b42183d 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -114,7 +114,7 @@ void listbox::remove_row(const unsigned row, unsigned count)
 	int row_pos_y = is_horizonal_ ? -1 : generator_->item(row).get_y()  - content_grid_->get_y();
 	int row_pos_x = is_horizonal_ ? -1 : 0;
 	for(; count; --count) {
-		if(generator_->item(row).get_visible() != tvisible::invisible) {
+		if(generator_->item(row).get_visible() != visibility::invisible) {
 			if(is_horizonal_) {
 				width_reduced += generator_->item(row).get_width();
 			}
@@ -162,7 +162,7 @@ void listbox::set_row_shown(const unsigned row, const bool shown)
 
 	bool resize_needed;
 	{
-		window::tinvalidate_layout_blocker invalidate_layout_blocker(*window);
+		window::invalidate_layout_blocker invalidate_layout_blocker(*window);
 
 		generator_->set_item_shown(row, shown);
 		point best_size = generator_->calculate_best_size();
@@ -200,7 +200,7 @@ void listbox::set_row_shown(const boost::dynamic_bitset<>& shown)
 
 	bool resize_needed;
 	{
-		window::tinvalidate_layout_blocker invalidate_layout_blocker(*window);
+		window::invalidate_layout_blocker invalidate_layout_blocker(*window);
 
 		for(size_t i = 0; i < shown.size(); ++i) {
 			generator_->set_item_shown(i, shown[i]);
@@ -296,7 +296,7 @@ void listbox::set_self_active(const bool /*active*/)
 
 bool listbox::update_content_size()
 {
-	if(get_visible() == widget::tvisible::invisible) {
+	if(get_visible() == widget::visibility::invisible) {
 		return true;
 	}
 
@@ -391,7 +391,7 @@ void listbox::resize_content(const int width_modification,
 
 void listbox::resize_content(const widget& row)
 {
-	if(row.get_visible() == tvisible::invisible) {
+	if(row.get_visible() == visibility::invisible) {
 		return;
 	}
 
@@ -713,7 +713,7 @@ listbox_definition::listbox_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing listbox " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -795,7 +795,7 @@ listbox_definition::listbox_definition(const config& cfg)
  * @macro = horizontal_listbox_description
  * The definition of a horizontal listbox is the same as for a normal listbox.
  */
-listbox_definition::tresolution::tresolution(const config& cfg)
+listbox_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid(nullptr)
 {
 	// Note the order should be the same as the enum state_t in listbox.hpp.
@@ -1020,8 +1020,8 @@ widget* builder_listbox::build() const
 	DBG_GUI_G << "Window builder: placed listbox '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const listbox_definition::tresolution>
-	conf = std::static_pointer_cast<const listbox_definition::tresolution>(
+	std::shared_ptr<const listbox_definition::resolution>
+	conf = std::static_pointer_cast<const listbox_definition::resolution>(
 			widget->config());
 	assert(conf);
 
@@ -1145,8 +1145,8 @@ widget* builder_horizontal_listbox::build() const
 	DBG_GUI_G << "Window builder: placed listbox '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const listbox_definition::tresolution>
-	conf = std::static_pointer_cast<const listbox_definition::tresolution>(
+	std::shared_ptr<const listbox_definition::resolution>
+	conf = std::static_pointer_cast<const listbox_definition::resolution>(
 			widget->config());
 	assert(conf);
 
@@ -1270,8 +1270,8 @@ widget* builder_grid_listbox::build() const
 	DBG_GUI_G << "Window builder: placed listbox '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const listbox_definition::tresolution>
-	conf = std::static_pointer_cast<const listbox_definition::tresolution>(
+	std::shared_ptr<const listbox_definition::resolution>
+	conf = std::static_pointer_cast<const listbox_definition::resolution>(
 			widget->config());
 	assert(conf);
 
diff --git a/src/gui/widgets/listbox.hpp b/src/gui/widgets/listbox.hpp
index fd5ba313ae0..fa949f9bec5 100644
--- a/src/gui/widgets/listbox.hpp
+++ b/src/gui/widgets/listbox.hpp
@@ -404,9 +404,9 @@ struct listbox_definition : public control_definition
 
 	explicit listbox_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
@@ -425,8 +425,8 @@ struct builder_listbox : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	builder_grid_ptr header;
 	builder_grid_ptr footer;
@@ -452,8 +452,8 @@ struct builder_horizontal_listbox : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	builder_grid_ptr list_builder;
 
@@ -476,8 +476,8 @@ struct builder_grid_listbox : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	builder_grid_ptr list_builder;
 
diff --git a/src/gui/widgets/matrix.cpp b/src/gui/widgets/matrix.cpp
index f074b9ff992..2ef45d1dd8c 100644
--- a/src/gui/widgets/matrix.cpp
+++ b/src/gui/widgets/matrix.cpp
@@ -37,22 +37,22 @@ namespace gui2
 REGISTER_WIDGET(matrix)
 
 
-tstate_default::tstate_default() : state_(ENABLED)
+state_default::state_default() : state_(ENABLED)
 {
 }
-void tstate_default::set_active(const bool active)
+void state_default::set_active(const bool active)
 {
 	if(get_active() != active) {
 		state_ = active ? ENABLED : DISABLED;
 	}
 }
 
-bool tstate_default::get_active() const
+bool state_default::get_active() const
 {
 	return state_ != DISABLED;
 }
 
-unsigned tstate_default::get_state() const
+unsigned state_default::get_state() const
 {
 	return state_;
 }
@@ -60,8 +60,8 @@ unsigned tstate_default::get_state() const
 matrix::matrix(const implementation::builder_matrix& builder)
 	: tbase(builder, get_control_type()), content_(), pane_(nullptr)
 {
-	std::shared_ptr<const matrix_definition::tresolution>
-	cfg = std::static_pointer_cast<const matrix_definition::tresolution>(
+	std::shared_ptr<const matrix_definition::resolution>
+	cfg = std::static_pointer_cast<const matrix_definition::resolution>(
 			config());
 
 	builder_widget::replacements_map replacements;
@@ -219,10 +219,10 @@ matrix_definition::matrix_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing matrix " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
-matrix_definition::tresolution::tresolution(const config& cfg)
+matrix_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, content(new builder_grid(cfg.child("content", "[matrix_definition]")))
 {
diff --git a/src/gui/widgets/matrix.hpp b/src/gui/widgets/matrix.hpp
index 956ce490a38..1d818c3d850 100644
--- a/src/gui/widgets/matrix.hpp
+++ b/src/gui/widgets/matrix.hpp
@@ -32,10 +32,10 @@ namespace implementation
 struct builder_matrix;
 }
 
-class tstate_default
+class state_default
 {
 public:
-	tstate_default();
+	state_default();
 
 	void set_active(const bool active);
 
@@ -95,7 +95,7 @@ public:
 	}
 };
 
-typedef control_NEW<tstate_default> tbase;
+typedef control_NEW<state_default> tbase;
 
 /** The matrix class. */
 class matrix : public tbase
@@ -237,9 +237,9 @@ struct matrix_definition : public control_definition
 
 	explicit matrix_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr content;
 	};
@@ -258,8 +258,8 @@ struct builder_matrix : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	builder_grid_ptr builder_top;
 	builder_grid_ptr builder_bottom;
diff --git a/src/gui/widgets/menu_button.cpp b/src/gui/widgets/menu_button.cpp
index 3e850d8c92b..113ce4735cb 100644
--- a/src/gui/widgets/menu_button.cpp
+++ b/src/gui/widgets/menu_button.cpp
@@ -204,7 +204,7 @@ menu_button_definition::menu_button_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing menu_button " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -235,7 +235,7 @@ menu_button_definition::menu_button_definition(const config& cfg)
  * @end{tag}{name="menu_button_definition"}
  * @end{parent}{name="gui/"}
  */
-menu_button_definition::tresolution::tresolution(const config& cfg)
+menu_button_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in menu_button.hpp.
diff --git a/src/gui/widgets/menu_button.hpp b/src/gui/widgets/menu_button.hpp
index 42789c179e9..5882c68981a 100644
--- a/src/gui/widgets/menu_button.hpp
+++ b/src/gui/widgets/menu_button.hpp
@@ -150,9 +150,9 @@ struct menu_button_definition : public control_definition
 {
 	explicit menu_button_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/minimap.cpp b/src/gui/widgets/minimap.cpp
index 192d3866a05..bccfa14aa83 100644
--- a/src/gui/widgets/minimap.cpp
+++ b/src/gui/widgets/minimap.cpp
@@ -62,9 +62,9 @@ unsigned minimap::get_state() const
 }
 
 /** Key type for the cache. */
-struct tkey
+struct key_type
 {
-	tkey(const int w, const int h, const std::string& map_data)
+	key_type(const int w, const int h, const std::string& map_data)
 		: w(w), h(h), map_data(map_data)
 	{
 	}
@@ -79,7 +79,7 @@ struct tkey
 	const std::string map_data;
 };
 
-static bool operator<(const tkey& lhs, const tkey& rhs)
+static bool operator<(const key_type& lhs, const key_type& rhs)
 {
 	return lhs.w < rhs.w
 		   || (lhs.w == rhs.w
@@ -88,9 +88,9 @@ static bool operator<(const tkey& lhs, const tkey& rhs)
 }
 
 /** Value type for the cache. */
-struct tvalue
+struct value_type
 {
-	tvalue(const surface& surf) : surf(surf), age(1)
+	value_type(const surface& surf) : surf(surf), age(1)
 	{
 	}
 
@@ -134,7 +134,7 @@ static const size_t cache_max_size = 100;
 static const ::config* terrain = nullptr;
 
 /** The cache. */
-typedef std::map<tkey, tvalue> tcache;
+typedef std::map<key_type, value_type> tcache;
 static tcache cache;
 
 static bool compare(const std::pair<unsigned, tcache::iterator>& lhs,
@@ -197,7 +197,7 @@ const surface minimap::get_image(const int w, const int h) const
 		cache.clear();
 	}
 
-	const tkey key(w, h, map_data_);
+	const key_type key(w, h, map_data_);
 	tcache::iterator itor = cache.find(key);
 
 	if(itor != cache.end()) {
@@ -216,7 +216,7 @@ const surface minimap::get_image(const int w, const int h) const
 	{
 		const gamemap map(std::make_shared<terrain_type_data>(*terrain_), map_data_);
 		const surface surf = image::getMinimap(w, h, map, nullptr);
-		cache.insert(std::make_pair(key, tvalue(surf)));
+		cache.insert(std::make_pair(key, value_type(surf)));
 #ifdef DEBUG_MINIMAP_CACHE
 		std::cerr << '-';
 #endif
@@ -269,7 +269,7 @@ minimap_definition::minimap_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing minimap " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -291,7 +291,7 @@ minimap_definition::minimap_definition(const config& cfg)
  * @end{tag}{name="minimap_definition"}
  * @end{parent}{name="gui/"}
  */
-minimap_definition::tresolution::tresolution(const config& cfg)
+minimap_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in minimap.hpp.
diff --git a/src/gui/widgets/minimap.hpp b/src/gui/widgets/minimap.hpp
index 0be2576be90..4ce90e21f2f 100644
--- a/src/gui/widgets/minimap.hpp
+++ b/src/gui/widgets/minimap.hpp
@@ -115,9 +115,9 @@ struct minimap_definition : public control_definition
 {
 	explicit minimap_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/multi_page.cpp b/src/gui/widgets/multi_page.cpp
index 8a0c8a85c5b..7ea5412d539 100644
--- a/src/gui/widgets/multi_page.cpp
+++ b/src/gui/widgets/multi_page.cpp
@@ -185,7 +185,7 @@ multi_page_definition::multi_page_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing multipage " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -209,7 +209,7 @@ multi_page_definition::multi_page_definition(const config& cfg)
  * @end{parent}{name="gui/"}
  * A multipage has no states.
  */
-multi_page_definition::tresolution::tresolution(const config& cfg)
+multi_page_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid(nullptr)
 {
 	const config& child = cfg.child("grid");
@@ -312,8 +312,8 @@ widget* builder_multi_page::build() const
 	DBG_GUI_G << "Window builder: placed multi_page '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const multi_page_definition::tresolution>
-	conf = std::static_pointer_cast<const multi_page_definition::tresolution>(
+	std::shared_ptr<const multi_page_definition::resolution>
+	conf = std::static_pointer_cast<const multi_page_definition::resolution>(
 					widget->config());
 	assert(conf);
 
diff --git a/src/gui/widgets/multi_page.hpp b/src/gui/widgets/multi_page.hpp
index d7307b2531a..270c41daf0e 100644
--- a/src/gui/widgets/multi_page.hpp
+++ b/src/gui/widgets/multi_page.hpp
@@ -177,9 +177,9 @@ struct multi_page_definition : public control_definition
 {
 	explicit multi_page_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
diff --git a/src/gui/widgets/pane.cpp b/src/gui/widgets/pane.cpp
index ad7eb452df1..5084b72079f 100644
--- a/src/gui/widgets/pane.cpp
+++ b/src/gui/widgets/pane.cpp
@@ -41,7 +41,7 @@ namespace gui2
  * functions. It also facilitates to create duplicates of functions for a const
  * and a non-const member function.
  */
-struct tpane_implementation
+struct pane_implementation
 {
 	/**
 	 * Implementation for the wrappers for
@@ -61,11 +61,10 @@ struct tpane_implementation
 			return nullptr;
 		}
 
-		typedef typename utils::const_clone<pane::titem, W>::reference thack;
-		for(thack item : pane->items_)
+		for(auto item : pane->items_)
 		{
 
-			if(item.grid->get_visible() == widget::tvisible::invisible) {
+			if(item.grid->get_visible() == widget::visibility::invisible) {
 				continue;
 			}
 
@@ -95,8 +94,7 @@ struct tpane_implementation
 	static typename utils::const_clone<grid, W>::pointer
 	get_grid(W pane, const unsigned id)
 	{
-		typedef typename utils::const_clone<pane::titem, W>::reference thack;
-		for(thack item : pane->items_)
+		for(auto item : pane->items_)
 		{
 
 			if(item.id == id) {
@@ -142,7 +140,7 @@ pane* pane::build(const implementation::builder_pane& builder)
 unsigned pane::create_item(const std::map<std::string, string_map>& item_data,
 							const std::map<std::string, std::string>& tags)
 {
-	titem item = { item_id_generator_++, tags, item_builder_->build() };
+	item item = { item_id_generator_++, tags, item_builder_->build() };
 
 	item.grid->set_parent(this);
 
@@ -183,7 +181,7 @@ void pane::layout_initialise(const bool full_initialisation)
 
 	for(auto & item : items_)
 	{
-		if(item.grid->get_visible() != widget::tvisible::invisible) {
+		if(item.grid->get_visible() != widget::visibility::invisible) {
 			item.grid->layout_initialise(full_initialisation);
 		}
 	}
@@ -196,7 +194,7 @@ pane::impl_draw_children(surface& frame_buffer, int x_offset, int y_offset)
 
 	for(auto & item : items_)
 	{
-		if(item.grid->get_visible() != widget::tvisible::invisible) {
+		if(item.grid->get_visible() != widget::visibility::invisible) {
 			item.grid->draw_children(frame_buffer, x_offset, y_offset);
 		}
 	}
@@ -224,8 +222,8 @@ void pane::filter(const tfilter_functor& filter_functor)
 	for(auto & item : items_)
 	{
 		item.grid->set_visible(filter_functor(item)
-									   ? widget::tvisible::visible
-									   : widget::tvisible::invisible);
+									   ? widget::visibility::visible
+									   : widget::visibility::invisible);
 	}
 
 	set_origin_children();
@@ -237,13 +235,13 @@ void pane::request_reduce_width(const unsigned /*maximum_width*/)
 
 widget* pane::find_at(const point& coordinate, const bool must_be_active)
 {
-	return tpane_implementation::find_at(this, coordinate, must_be_active);
+	return pane_implementation::find_at(this, coordinate, must_be_active);
 }
 
 const widget* pane::find_at(const point& coordinate,
 							  const bool must_be_active) const
 {
-	return tpane_implementation::find_at(this, coordinate, must_be_active);
+	return pane_implementation::find_at(this, coordinate, must_be_active);
 }
 
 point pane::calculate_best_size() const
@@ -267,12 +265,12 @@ iterator::walker_base* pane::create_walker()
 
 grid* pane::get_grid(const unsigned id)
 {
-	return tpane_implementation::get_grid(this, id);
+	return pane_implementation::get_grid(this, id);
 }
 
 const grid* pane::get_grid(const unsigned id) const
 {
-	return tpane_implementation::get_grid(this, id);
+	return pane_implementation::get_grid(this, id);
 }
 
 void pane::place_children()
@@ -281,7 +279,7 @@ void pane::place_children()
 	unsigned index = 0;
 	for(auto & item : items_)
 	{
-		if(item.grid->get_visible() == widget::tvisible::invisible) {
+		if(item.grid->get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -297,7 +295,7 @@ void pane::set_origin_children()
 	unsigned index = 0;
 	for(auto & item : items_)
 	{
-		if(item.grid->get_visible() == widget::tvisible::invisible) {
+		if(item.grid->get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -313,7 +311,7 @@ void pane::place_or_set_origin_children()
 	unsigned index = 0;
 	for(auto & item : items_)
 	{
-		if(item.grid->get_visible() == widget::tvisible::invisible) {
+		if(item.grid->get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -334,7 +332,7 @@ void pane::prepare_placement() const
 
 	for(const auto & item : items_)
 	{
-		if(item.grid->get_visible() == widget::tvisible::invisible) {
+		if(item.grid->get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -353,7 +351,7 @@ void pane::signal_handler_request_placement(dispatcher& dispatcher,
 		for(auto & item : items_)
 		{
 			if(item.grid->has_widget(*wgt)) {
-				if(item.grid->get_visible() != widget::tvisible::invisible) {
+				if(item.grid->get_visible() != widget::visibility::invisible) {
 
 					/*
 					 * This time we call init layout but also the linked widget
diff --git a/src/gui/widgets/pane.hpp b/src/gui/widgets/pane.hpp
index 9054fbd215a..5237cb844e4 100644
--- a/src/gui/widgets/pane.hpp
+++ b/src/gui/widgets/pane.hpp
@@ -39,10 +39,10 @@ class grid;
 
 class pane : public widget
 {
-	friend struct tpane_implementation;
+	friend struct pane_implementation;
 
 public:
-	struct titem
+	struct item
 	{
 
 		unsigned id;
@@ -51,9 +51,9 @@ public:
 		grid* grid;
 	};
 
-	typedef std::function<bool(const titem&, const titem&)> tcompare_functor;
+	typedef std::function<bool(const item&, const item&)> tcompare_functor;
 
-	typedef std::function<bool(const titem&)> tfilter_functor;
+	typedef std::function<bool(const item&)> tfilter_functor;
 
 	/** @deprecated Use the second overload. */
 	explicit pane(const builder_grid_ptr item_builder);
@@ -152,7 +152,7 @@ public:
 
 private:
 	/** The items in the pane. */
-	std::list<titem> items_;
+	std::list<item> items_;
 
 	/** The builer for the items in the list. */
 	builder_grid_ptr item_builder_;
diff --git a/src/gui/widgets/panel.cpp b/src/gui/widgets/panel.cpp
index 3a1f4f39120..f62dae70ac8 100644
--- a/src/gui/widgets/panel.cpp
+++ b/src/gui/widgets/panel.cpp
@@ -36,8 +36,8 @@ REGISTER_WIDGET(panel)
 
 SDL_Rect panel::get_client_rect() const
 {
-	std::shared_ptr<const panel_definition::tresolution> conf
-			= std::static_pointer_cast<const panel_definition::tresolution>(
+	std::shared_ptr<const panel_definition::resolution> conf
+			= std::static_pointer_cast<const panel_definition::resolution>(
 					config());
 	assert(conf);
 
@@ -76,8 +76,8 @@ void panel::impl_draw_foreground(surface& frame_buffer, int x_offset, int y_offs
 
 point panel::border_space() const
 {
-	std::shared_ptr<const panel_definition::tresolution> conf
-			= std::static_pointer_cast<const panel_definition::tresolution>(
+	std::shared_ptr<const panel_definition::resolution> conf
+			= std::static_pointer_cast<const panel_definition::resolution>(
 					config());
 	assert(conf);
 
@@ -102,7 +102,7 @@ panel_definition::panel_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing panel " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -143,7 +143,7 @@ panel_definition::panel_definition(const config& cfg)
  * @end{tag}{name="panel_definition"}
  * @end{parent}{name="gui/"}
  */
-panel_definition::tresolution::tresolution(const config& cfg)
+panel_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, top_border(cfg["top_border"])
 	, bottom_border(cfg["bottom_border"])
diff --git a/src/gui/widgets/panel.hpp b/src/gui/widgets/panel.hpp
index af531ff3aeb..66ab9bb7244 100644
--- a/src/gui/widgets/panel.hpp
+++ b/src/gui/widgets/panel.hpp
@@ -80,9 +80,9 @@ struct panel_definition : public control_definition
 {
 	explicit panel_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		unsigned top_border;
 		unsigned bottom_border;
diff --git a/src/gui/widgets/progress_bar.cpp b/src/gui/widgets/progress_bar.cpp
index b83214f1f0c..1e51dc57153 100644
--- a/src/gui/widgets/progress_bar.cpp
+++ b/src/gui/widgets/progress_bar.cpp
@@ -81,7 +81,7 @@ progress_bar_definition::progress_bar_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing progress bar " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -106,7 +106,7 @@ progress_bar_definition::progress_bar_definition(const config& cfg)
  * @end{tag}{name="progress_bar_definition"}
  * @end{parent}{name="gui/"}
  */
-progress_bar_definition::tresolution::tresolution(const config& cfg)
+progress_bar_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in progress_bar.hpp.
diff --git a/src/gui/widgets/progress_bar.hpp b/src/gui/widgets/progress_bar.hpp
index 77b769cceaf..3e81b39b4c2 100644
--- a/src/gui/widgets/progress_bar.hpp
+++ b/src/gui/widgets/progress_bar.hpp
@@ -81,9 +81,9 @@ struct progress_bar_definition : public control_definition
 {
 	explicit progress_bar_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/repeating_button.cpp b/src/gui/widgets/repeating_button.cpp
index 80515e8f251..aadbcd063df 100644
--- a/src/gui/widgets/repeating_button.cpp
+++ b/src/gui/widgets/repeating_button.cpp
@@ -173,7 +173,7 @@ repeating_button_definition::repeating_button_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing repeating button " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -204,7 +204,7 @@ repeating_button_definition::repeating_button_definition(const config& cfg)
  * @end{tag}{name="repeating_button_definition"}
  * @end{parent}{name="gui/"}
  */
-repeating_button_definition::tresolution::tresolution(const config& cfg)
+repeating_button_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in
diff --git a/src/gui/widgets/repeating_button.hpp b/src/gui/widgets/repeating_button.hpp
index 61defbf68ef..4260ec630c9 100644
--- a/src/gui/widgets/repeating_button.hpp
+++ b/src/gui/widgets/repeating_button.hpp
@@ -122,9 +122,9 @@ struct repeating_button_definition : public control_definition
 {
 	explicit repeating_button_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/scroll_label.cpp b/src/gui/widgets/scroll_label.cpp
index a30f2d8aa91..6aecdaa04f7 100644
--- a/src/gui/widgets/scroll_label.cpp
+++ b/src/gui/widgets/scroll_label.cpp
@@ -141,7 +141,7 @@ scroll_label_definition::scroll_label_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing scroll label " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -186,7 +186,7 @@ scroll_label_definition::scroll_label_definition(const config& cfg)
  * @end{tag}{name="scroll_label_definition"}
  * @end{parent}{name="gui/"}
  */
-scroll_label_definition::tresolution::tresolution(const config& cfg)
+scroll_label_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid(nullptr)
 {
 	// Note the order should be the same as the enum state_t is scroll_label.hpp.
@@ -257,8 +257,8 @@ widget* builder_scroll_label::build() const
 	widget->set_vertical_scrollbar_mode(vertical_scrollbar_mode);
 	widget->set_horizontal_scrollbar_mode(horizontal_scrollbar_mode);
 
-	std::shared_ptr<const scroll_label_definition::tresolution>
-	conf = std::static_pointer_cast<const scroll_label_definition::tresolution>(
+	std::shared_ptr<const scroll_label_definition::resolution>
+	conf = std::static_pointer_cast<const scroll_label_definition::resolution>(
 					widget->config());
 	assert(conf);
 
diff --git a/src/gui/widgets/scroll_label.hpp b/src/gui/widgets/scroll_label.hpp
index 104c4051f79..2991de8eb3f 100644
--- a/src/gui/widgets/scroll_label.hpp
+++ b/src/gui/widgets/scroll_label.hpp
@@ -111,9 +111,9 @@ struct scroll_label_definition : public control_definition
 {
 	explicit scroll_label_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
@@ -132,8 +132,8 @@ struct builder_scroll_label : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 	bool wrap_on;
 	const std::string text_alignment;
 };
diff --git a/src/gui/widgets/scrollbar.cpp b/src/gui/widgets/scrollbar.cpp
index d1700f89bd7..90c07f85bd7 100644
--- a/src/gui/widgets/scrollbar.cpp
+++ b/src/gui/widgets/scrollbar.cpp
@@ -51,7 +51,7 @@ scrollbar_base::scrollbar_base()
 			&scrollbar_base::signal_handler_left_button_up, this, _2, _3));
 }
 
-void scrollbar_base::scroll(const tscroll scroll)
+void scrollbar_base::scroll(const scroll_mode scroll)
 {
 	switch(scroll) {
 		case BEGIN:
diff --git a/src/gui/widgets/scrollbar.hpp b/src/gui/widgets/scrollbar.hpp
index 11e5a8018bb..e57319e6d73 100644
--- a/src/gui/widgets/scrollbar.hpp
+++ b/src/gui/widgets/scrollbar.hpp
@@ -52,7 +52,7 @@ public:
 	 * When scrolling we always scroll a 'fixed' amount, these are the
 	 * parameters for these amounts.
 	 */
-	enum tscroll {
+	enum scroll_mode {
 		BEGIN,				 /**< Go to begin position. */
 		ITEM_BACKWARDS,		 /**< Go one item towards the begin. */
 		HALF_JUMP_BACKWARDS, /**< Go half the visible items towards the begin.
@@ -71,7 +71,7 @@ public:
 	 *
 	 * @param scroll              'step size' to scroll.
 	 */
-	void scroll(const tscroll scroll);
+	void scroll(const scroll_mode scroll);
 
 	/** Is the positioner at the beginning of the scrollbar? */
 	bool at_begin() const
diff --git a/src/gui/widgets/scrollbar_container.cpp b/src/gui/widgets/scrollbar_container.cpp
index 6bb82836068..29b58cb947d 100644
--- a/src/gui/widgets/scrollbar_container.cpp
+++ b/src/gui/widgets/scrollbar_container.cpp
@@ -45,9 +45,9 @@ static const std::string button_down_names[]
  * Returns a map with the names of all buttons and the scrollbar jump they're
  * supposed to execute.
  */
-const std::map<std::string, scrollbar_base::tscroll>& scroll_lookup()
+const std::map<std::string, scrollbar_base::scroll_mode>& scroll_lookup()
 {
-	static std::map<std::string, scrollbar_base::tscroll> lookup;
+	static std::map<std::string, scrollbar_base::scroll_mode> lookup;
 	if(lookup.empty()) {
 		lookup["_begin"] = scrollbar_base::BEGIN;
 		lookup["_line_up"] = scrollbar_base::ITEM_BACKWARDS;
@@ -127,34 +127,34 @@ void scrollbar_container::layout_initialise(const bool full_initialisation)
 		switch(vertical_scrollbar_mode_) {
 			case ALWAYS_VISIBLE:
 				vertical_scrollbar_grid_->set_visible(
-						widget::tvisible::visible);
+						widget::visibility::visible);
 				break;
 
 			case AUTO_VISIBLE:
 				vertical_scrollbar_grid_->set_visible(
-						widget::tvisible::hidden);
+						widget::visibility::hidden);
 				break;
 
 			default:
 				vertical_scrollbar_grid_->set_visible(
-						widget::tvisible::invisible);
+						widget::visibility::invisible);
 		}
 
 		assert(horizontal_scrollbar_grid_);
 		switch(horizontal_scrollbar_mode_) {
 			case ALWAYS_VISIBLE:
 				horizontal_scrollbar_grid_->set_visible(
-						widget::tvisible::visible);
+						widget::visibility::visible);
 				break;
 
 			case AUTO_VISIBLE:
 				horizontal_scrollbar_grid_->set_visible(
-						widget::tvisible::hidden);
+						widget::visibility::hidden);
 				break;
 
 			default:
 				horizontal_scrollbar_grid_->set_visible(
-						widget::tvisible::invisible);
+						widget::visibility::invisible);
 		}
 	}
 
@@ -174,7 +174,7 @@ void scrollbar_container::request_reduce_height(const unsigned maximum_height)
 	const unsigned offset
 			= horizontal_scrollbar_grid_
 					  && horizontal_scrollbar_grid_->get_visible()
-						 != widget::tvisible::invisible
+						 != widget::visibility::invisible
 					  ? horizontal_scrollbar_grid_->get_best_size().y
 					  : 0;
 
@@ -195,16 +195,16 @@ void scrollbar_container::request_reduce_height(const unsigned maximum_height)
 
 	assert(vertical_scrollbar_grid_);
 	const bool resized = vertical_scrollbar_grid_->get_visible()
-						 == widget::tvisible::invisible;
+						 == widget::visibility::invisible;
 
 	// Always set the bar visible, is a nop is already visible.
-	vertical_scrollbar_grid_->set_visible(widget::tvisible::visible);
+	vertical_scrollbar_grid_->set_visible(widget::visibility::visible);
 
 	const point scrollbar_size = vertical_scrollbar_grid_->get_best_size();
 
 	// If showing the scrollbar increased the height, hide and abort.
 	if(resized && scrollbar_size.y > size.y) {
-		vertical_scrollbar_grid_->set_visible(widget::tvisible::invisible);
+		vertical_scrollbar_grid_->set_visible(widget::visibility::invisible);
 		DBG_GUI_L << LOG_HEADER << " request failed, showing the scrollbar"
 				  << " increased the height to " << scrollbar_size.y << ".\n";
 		return;
@@ -239,7 +239,7 @@ void scrollbar_container::request_reduce_width(const unsigned maximum_width)
 	const unsigned offset
 			= vertical_scrollbar_grid_
 					  && vertical_scrollbar_grid_->get_visible()
-						 != widget::tvisible::invisible
+						 != widget::visibility::invisible
 					  ? vertical_scrollbar_grid_->get_best_size().x
 					  : 0;
 
@@ -260,7 +260,7 @@ void scrollbar_container::request_reduce_width(const unsigned maximum_width)
 
 	// Always set the bar visible, is a nop when it's already visible.
 	assert(horizontal_scrollbar_grid_);
-	horizontal_scrollbar_grid_->set_visible(widget::tvisible::visible);
+	horizontal_scrollbar_grid_->set_visible(widget::visibility::visible);
 	size = get_best_size();
 
 	point scrollbar_size = horizontal_scrollbar_grid_->get_best_size();
@@ -270,7 +270,7 @@ void scrollbar_container::request_reduce_width(const unsigned maximum_width)
 	 * minimum size.
 	 */
 	if(vertical_scrollbar_grid_->get_visible()
-	   != widget::tvisible::invisible) {
+	   != widget::visibility::invisible) {
 
 		scrollbar_size.x += vertical_scrollbar_grid_->get_best_size().x;
 	}
@@ -279,7 +279,7 @@ void scrollbar_container::request_reduce_width(const unsigned maximum_width)
 	if(horizontal_scrollbar_mode_ == AUTO_VISIBLE_FIRST_RUN && scrollbar_size.x
 															   > size.x) {
 
-		horizontal_scrollbar_grid_->set_visible(widget::tvisible::invisible);
+		horizontal_scrollbar_grid_->set_visible(widget::visibility::invisible);
 		DBG_GUI_L << LOG_HEADER << " request failed, showing the scrollbar"
 				  << " increased the width to " << scrollbar_size.x << ".\n";
 		return;
@@ -309,14 +309,14 @@ point scrollbar_container::calculate_best_size() const
 	/***** get vertical scrollbar size *****/
 	const point vertical_scrollbar
 			= vertical_scrollbar_grid_->get_visible()
-					  == widget::tvisible::invisible
+					  == widget::visibility::invisible
 					  ? point()
 					  : vertical_scrollbar_grid_->get_best_size();
 
 	/***** get horizontal scrollbar size *****/
 	const point horizontal_scrollbar
 			= horizontal_scrollbar_grid_->get_visible()
-					  == widget::tvisible::invisible
+					  == widget::visibility::invisible
 					  ? point()
 					  : horizontal_scrollbar_grid_->get_best_size();
 
@@ -350,14 +350,14 @@ point scrollbar_container::calculate_best_size() const
 static void
 set_scrollbar_mode(grid* scrollbar_grid,
 				   scrollbar_base* scrollbar,
-				   scrollbar_container::tscrollbar_mode& scrollbar_mode,
+				   scrollbar_container::scrollbar_mode& scrollbar_mode,
 				   const unsigned items,
 				   const unsigned visible_items)
 {
 	assert(scrollbar_grid && scrollbar);
 
 	if(scrollbar_mode == scrollbar_container::ALWAYS_INVISIBLE) {
-		scrollbar_grid->set_visible(widget::tvisible::invisible);
+		scrollbar_grid->set_visible(widget::visibility::invisible);
 		return;
 	}
 
@@ -370,8 +370,8 @@ set_scrollbar_mode(grid* scrollbar_grid,
 		const bool scrollbar_needed = items > visible_items;
 
 		scrollbar_grid->set_visible(scrollbar_needed
-											? widget::tvisible::visible
-											: widget::tvisible::hidden);
+											? widget::visibility::visible
+											: widget::visibility::hidden);
 	}
 }
 static bool is_inserted_before(unsigned insertion_pos, unsigned old_item_count, unsigned old_position, unsigned visible_items)
@@ -389,7 +389,7 @@ static bool is_inserted_before(unsigned insertion_pos, unsigned old_item_count,
 static void
 adjust_scrollbar_mode(grid* scrollbar_grid,
 				   scrollbar_base* scrollbar,
-				   scrollbar_container::tscrollbar_mode& scrollbar_mode,
+				   scrollbar_container::scrollbar_mode& scrollbar_mode,
 				   const unsigned items_before,
 				   const unsigned items_after,
 				   const int insertion_pos,
@@ -405,7 +405,7 @@ adjust_scrollbar_mode(grid* scrollbar_grid,
 	const bool inserted_before_visible_area = is_inserted_before(static_cast<unsigned>(insertion_pos), items_before, previous_item_position, visible_items);
 
 	if(scrollbar_mode == scrollbar_container::ALWAYS_INVISIBLE) {
-		scrollbar_grid->set_visible(widget::tvisible::invisible);
+		scrollbar_grid->set_visible(widget::visibility::invisible);
 		return;
 	}
 
@@ -419,8 +419,8 @@ adjust_scrollbar_mode(grid* scrollbar_grid,
 		const bool scrollbar_needed = items_after > visible_items;
 
 		scrollbar_grid->set_visible(scrollbar_needed
-											? widget::tvisible::visible
-											: widget::tvisible::hidden);
+											? widget::visibility::visible
+											: widget::visibility::hidden);
 	}
 }
 
@@ -579,7 +579,7 @@ bool scrollbar_container::content_resize_request(const bool force_sizing)
 		if(horizontal_scrollbar_mode_ == ALWAYS_INVISIBLE
 		   || (horizontal_scrollbar_mode_ == AUTO_VISIBLE_FIRST_RUN
 			   && horizontal_scrollbar_grid_->get_visible()
-				  == widget::tvisible::invisible)) {
+				  == widget::visibility::invisible)) {
 
 			DBG_GUI_L << LOG_HEADER
 					  << " can't use horizontal scrollbar, ask window.\n";
@@ -595,7 +595,7 @@ bool scrollbar_container::content_resize_request(const bool force_sizing)
 		if(vertical_scrollbar_mode_ == ALWAYS_INVISIBLE
 		   || (vertical_scrollbar_mode_ == AUTO_VISIBLE_FIRST_RUN
 			   && vertical_scrollbar_grid_->get_visible()
-				  == widget::tvisible::invisible)) {
+				  == widget::visibility::invisible)) {
 
 			DBG_GUI_L << LOG_HEADER
 					  << " can't use vertical scrollbar, ask window.\n";
@@ -681,7 +681,7 @@ bool scrollbar_container::content_resize_width(const int width_modification, con
 	if(horizontal_scrollbar_mode_ == ALWAYS_INVISIBLE
 	   || (horizontal_scrollbar_mode_ == AUTO_VISIBLE_FIRST_RUN
 		   && horizontal_scrollbar_grid_->get_visible()
-			  == widget::tvisible::invisible)) {
+			  == widget::visibility::invisible)) {
 
 		DBG_GUI_L << " can't use horizontal scrollbar, ask window.\n";
 		window* window = get_window();
@@ -733,7 +733,7 @@ bool scrollbar_container::content_resize_height(const int height_modification, c
 	if(vertical_scrollbar_mode_ == ALWAYS_INVISIBLE
 	   || (vertical_scrollbar_mode_ == AUTO_VISIBLE_FIRST_RUN
 		   && vertical_scrollbar_grid_->get_visible()
-			  == widget::tvisible::invisible)) {
+			  == widget::visibility::invisible)) {
 
 		DBG_GUI_L << " can't use vertical scrollbar, ask window.\n";
 		window* window = get_window();
@@ -822,7 +822,7 @@ void scrollbar_container::finalize_setup()
 }
 
 void scrollbar_container::set_vertical_scrollbar_mode(
-		const tscrollbar_mode scrollbar_mode)
+		const scrollbar_mode scrollbar_mode)
 {
 	if(vertical_scrollbar_mode_ != scrollbar_mode) {
 		vertical_scrollbar_mode_ = scrollbar_mode;
@@ -830,7 +830,7 @@ void scrollbar_container::set_vertical_scrollbar_mode(
 }
 
 void scrollbar_container::set_horizontal_scrollbar_mode(
-		const tscrollbar_mode scrollbar_mode)
+		const scrollbar_mode scrollbar_mode)
 {
 	if(horizontal_scrollbar_mode_ != scrollbar_mode) {
 		horizontal_scrollbar_mode_ = scrollbar_mode;
@@ -841,8 +841,8 @@ void scrollbar_container::impl_draw_children(surface& frame_buffer,
 											  int x_offset,
 											  int y_offset)
 {
-	assert(get_visible() == widget::tvisible::visible
-		   && content_grid_->get_visible() == widget::tvisible::visible);
+	assert(get_visible() == widget::visibility::visible
+		   && content_grid_->get_visible() == widget::visibility::visible);
 
 	// Inherited.
 	container_base::impl_draw_children(frame_buffer, x_offset, y_offset);
@@ -1025,7 +1025,7 @@ void scrollbar_container::set_horizontal_scrollbar_item_position(
 }
 
 void scrollbar_container::scroll_vertical_scrollbar(
-		const scrollbar_base::tscroll scroll)
+		const scrollbar_base::scroll_mode scroll)
 {
 	assert(vertical_scrollbar_);
 
@@ -1034,7 +1034,7 @@ void scrollbar_container::scroll_vertical_scrollbar(
 }
 
 void scrollbar_container::scroll_horizontal_scrollbar(
-		const scrollbar_base::tscroll scroll)
+		const scrollbar_base::scroll_mode scroll)
 {
 	assert(horizontal_scrollbar_);
 
@@ -1219,7 +1219,7 @@ scrollbar_container::signal_handler_sdl_wheel_up(const event::event_t event,
 
 	assert(vertical_scrollbar_grid_ && vertical_scrollbar_);
 
-	if(vertical_scrollbar_grid_->get_visible() == widget::tvisible::visible) {
+	if(vertical_scrollbar_grid_->get_visible() == widget::visibility::visible) {
 		vertical_scrollbar_->scroll(scrollbar_base::HALF_JUMP_BACKWARDS);
 		scrollbar_moved();
 		handled = true;
@@ -1234,7 +1234,7 @@ scrollbar_container::signal_handler_sdl_wheel_down(const event::event_t event,
 
 	assert(vertical_scrollbar_grid_ && vertical_scrollbar_);
 
-	if(vertical_scrollbar_grid_->get_visible() == widget::tvisible::visible) {
+	if(vertical_scrollbar_grid_->get_visible() == widget::visibility::visible) {
 		vertical_scrollbar_->scroll(scrollbar_base::HALF_JUMP_FORWARD);
 		scrollbar_moved();
 		handled = true;
@@ -1250,7 +1250,7 @@ scrollbar_container::signal_handler_sdl_wheel_left(const event::event_t event,
 	assert(horizontal_scrollbar_grid_ && horizontal_scrollbar_);
 
 	if(horizontal_scrollbar_grid_->get_visible()
-	   == widget::tvisible::visible) {
+	   == widget::visibility::visible) {
 		horizontal_scrollbar_->scroll(scrollbar_base::HALF_JUMP_BACKWARDS);
 		scrollbar_moved();
 		handled = true;
@@ -1266,7 +1266,7 @@ scrollbar_container::signal_handler_sdl_wheel_right(const event::event_t event,
 	assert(horizontal_scrollbar_grid_ && horizontal_scrollbar_);
 
 	if(horizontal_scrollbar_grid_->get_visible()
-	   == widget::tvisible::visible) {
+	   == widget::visibility::visible) {
 		horizontal_scrollbar_->scroll(scrollbar_base::HALF_JUMP_FORWARD);
 		scrollbar_moved();
 		handled = true;
diff --git a/src/gui/widgets/scrollbar_container.hpp b/src/gui/widgets/scrollbar_container.hpp
index 90209aeb641..b5ea111970d 100644
--- a/src/gui/widgets/scrollbar_container.hpp
+++ b/src/gui/widgets/scrollbar_container.hpp
@@ -59,7 +59,7 @@ public:
 	}
 
 	/** The way to handle the showing or hiding of the scrollbar. */
-	enum tscrollbar_mode {
+	enum scrollbar_mode {
 		/**
 		 * The scrollbar is always shown, whether needed or not.
 		 */
@@ -147,15 +147,15 @@ public:
 	/***** ***** ***** setters / getters for members ***** ****** *****/
 
 	/** @note shouldn't be called after being shown in a dialog. */
-	void set_vertical_scrollbar_mode(const tscrollbar_mode scrollbar_mode);
-	tscrollbar_mode get_vertical_scrollbar_mode() const
+	void set_vertical_scrollbar_mode(const scrollbar_mode scrollbar_mode);
+	scrollbar_mode get_vertical_scrollbar_mode() const
 	{
 		return vertical_scrollbar_mode_;
 	}
 
 	/** @note shouldn't be called after being shown in a dialog. */
-	void set_horizontal_scrollbar_mode(const tscrollbar_mode scrollbar_mode);
-	tscrollbar_mode get_horizontal_scrollbar_mode() const
+	void set_horizontal_scrollbar_mode(const scrollbar_mode scrollbar_mode);
+	scrollbar_mode get_horizontal_scrollbar_mode() const
 	{
 		return horizontal_scrollbar_mode_;
 	}
@@ -212,14 +212,14 @@ public:
 	 *
 	 * @param scroll              The position to scroll to.
 	 */
-	void scroll_vertical_scrollbar(const scrollbar_base::tscroll scroll);
+	void scroll_vertical_scrollbar(const scrollbar_base::scroll_mode scroll);
 
 	/**
 	 * Scrolls the horizontal scrollbar.
 	 *
 	 * @param scroll              The position to scroll to.
 	 */
-	void scroll_horizontal_scrollbar(const scrollbar_base::tscroll scroll);
+	void scroll_horizontal_scrollbar(const scrollbar_base::scroll_mode scroll);
 
 	/**
 	 * Callback when the scrollbar moves (NOTE maybe only one callback needed).
@@ -473,7 +473,7 @@ private:
 	 * This value should only be modified before showing, doing it while
 	 * showing results in UB.
 	 */
-	tscrollbar_mode vertical_scrollbar_mode_, horizontal_scrollbar_mode_;
+	scrollbar_mode vertical_scrollbar_mode_, horizontal_scrollbar_mode_;
 
 	/** These are valid after finalize_setup(). */
 	grid* vertical_scrollbar_grid_, *horizontal_scrollbar_grid_;
diff --git a/src/gui/widgets/scrollbar_panel.cpp b/src/gui/widgets/scrollbar_panel.cpp
index 0a74cc935af..d97431e65a5 100644
--- a/src/gui/widgets/scrollbar_panel.cpp
+++ b/src/gui/widgets/scrollbar_panel.cpp
@@ -60,7 +60,7 @@ scrollbar_panel_definition::scrollbar_panel_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing scrollbar panel " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -88,7 +88,7 @@ scrollbar_panel_definition::scrollbar_panel_definition(const config& cfg)
  * @end{tag}{name="scrollbar_panel_definition"}
  * @end{parent}{name="gui/"}
  */
-scrollbar_panel_definition::tresolution::tresolution(const config& cfg)
+scrollbar_panel_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid()
 {
 	// The panel needs to know the order.
@@ -162,8 +162,8 @@ widget* builder_scrollbar_panel::build() const
 	DBG_GUI_G << "Window builder: placed scrollbar_panel '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const scrollbar_panel_definition::tresolution> conf
-			= std::static_pointer_cast<const scrollbar_panel_definition::tresolution>(
+	std::shared_ptr<const scrollbar_panel_definition::resolution> conf
+			= std::static_pointer_cast<const scrollbar_panel_definition::resolution>(
 				panel->config());
 	assert(conf);
 
diff --git a/src/gui/widgets/scrollbar_panel.hpp b/src/gui/widgets/scrollbar_panel.hpp
index 9eb13c92eb9..b1c1da9a120 100644
--- a/src/gui/widgets/scrollbar_panel.hpp
+++ b/src/gui/widgets/scrollbar_panel.hpp
@@ -72,9 +72,9 @@ struct scrollbar_panel_definition : public control_definition
 
 	explicit scrollbar_panel_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
@@ -93,8 +93,8 @@ struct builder_scrollbar_panel : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	builder_grid_ptr grid_;
 };
diff --git a/src/gui/widgets/settings.cpp b/src/gui/widgets/settings.cpp
index 08d3fdd29ab..029bd9cf34c 100644
--- a/src/gui/widgets/settings.cpp
+++ b/src/gui/widgets/settings.cpp
@@ -485,7 +485,7 @@ void register_window(const std::string& id)
 	}
 }
 
-std::vector<std::string> tunit_test_access_only::get_registered_window_list()
+std::vector<std::string> unit_test_access_only::get_registered_window_list()
 {
 	return gui2::registered_window_types();
 }
@@ -668,10 +668,10 @@ get_window_builder(const std::string& type)
 		if(current_gui != default_gui) {
 			window = default_gui->second.window_types.find(type);
 			if(window == default_gui->second.window_types.end()) {
-				throw twindow_builder_invalid_id();
+				throw window_builder_invalid_id();
 			}
 		} else if(window == current_gui->second.window_types.end()) {
-			throw twindow_builder_invalid_id();
+			throw window_builder_invalid_id();
 		}
 	}
 
diff --git a/src/gui/widgets/settings.hpp b/src/gui/widgets/settings.hpp
index 279dbd96015..0b1ffa728f9 100644
--- a/src/gui/widgets/settings.hpp
+++ b/src/gui/widgets/settings.hpp
@@ -60,7 +60,7 @@ void register_window(const std::string& id);
  * This is used in the unit tests, but these implementation details shouldn't
  * be used in the normal code.
  */
-class tunit_test_access_only
+class unit_test_access_only
 {
 	friend std::vector<std::string>& unit_test_registered_window_list();
 
@@ -139,7 +139,7 @@ resolution_definition_ptr get_control(const std::string& control_type,
 									   const std::string& definition);
 
 /** Helper struct to signal that get_window_builder failed. */
-struct twindow_builder_invalid_id
+struct window_builder_invalid_id
 {
 };
 
@@ -152,7 +152,7 @@ struct twindow_builder_invalid_id
  * @pre                       There is a valid builder for @p type at the
  *                            current resolution.
  *
- * @throw twindow_builder_invalid_id
+ * @throw window_builder_invalid_id
  *                            When the precondition is violated.
  *
  * @param type                The type of builder window to get.
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 872e69c12f5..e7b02ab5b4f 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -63,9 +63,9 @@ point slider::calculate_best_size() const
 	if(best_slider_length_ != 0) {
 
 		// Override length.
-		std::shared_ptr<const slider_definition::tresolution> conf
+		std::shared_ptr<const slider_definition::resolution> conf
 				= std::static_pointer_cast<const slider_definition::
-													  tresolution>(config());
+													  resolution>(config());
 
 		assert(conf);
 
@@ -156,8 +156,8 @@ void slider::child_callback_positioner_moved()
 
 unsigned slider::minimum_positioner_length() const
 {
-	std::shared_ptr<const slider_definition::tresolution>
-	conf = std::static_pointer_cast<const slider_definition::tresolution>(
+	std::shared_ptr<const slider_definition::resolution>
+	conf = std::static_pointer_cast<const slider_definition::resolution>(
 			config());
 	assert(conf);
 	return conf->minimum_positioner_length;
@@ -165,8 +165,8 @@ unsigned slider::minimum_positioner_length() const
 
 unsigned slider::maximum_positioner_length() const
 {
-	std::shared_ptr<const slider_definition::tresolution>
-	conf = std::static_pointer_cast<const slider_definition::tresolution>(
+	std::shared_ptr<const slider_definition::resolution>
+	conf = std::static_pointer_cast<const slider_definition::resolution>(
 			config());
 	assert(conf);
 	return conf->maximum_positioner_length;
@@ -174,8 +174,8 @@ unsigned slider::maximum_positioner_length() const
 
 unsigned slider::offset_before() const
 {
-	std::shared_ptr<const slider_definition::tresolution>
-	conf = std::static_pointer_cast<const slider_definition::tresolution>(
+	std::shared_ptr<const slider_definition::resolution>
+	conf = std::static_pointer_cast<const slider_definition::resolution>(
 			config());
 	assert(conf);
 	return conf->left_offset;
@@ -183,8 +183,8 @@ unsigned slider::offset_before() const
 
 unsigned slider::offset_after() const
 {
-	std::shared_ptr<const slider_definition::tresolution>
-	conf = std::static_pointer_cast<const slider_definition::tresolution>(
+	std::shared_ptr<const slider_definition::resolution>
+	conf = std::static_pointer_cast<const slider_definition::resolution>(
 			config());
 	assert(conf);
 	return conf->right_offset;
@@ -348,7 +348,7 @@ slider_definition::slider_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing slider " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -398,7 +398,7 @@ slider_definition::slider_definition(const config& cfg)
  * @end{tag}{name="slider_definition"}
  * @end{parent}{name="gui/"}
  */
-slider_definition::tresolution::tresolution(const config& cfg)
+slider_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, minimum_positioner_length(cfg["minimum_positioner_length"])
 	, maximum_positioner_length(cfg["maximum_positioner_length"])
diff --git a/src/gui/widgets/slider.hpp b/src/gui/widgets/slider.hpp
index a7ea07d0000..043d3990ef7 100644
--- a/src/gui/widgets/slider.hpp
+++ b/src/gui/widgets/slider.hpp
@@ -217,9 +217,9 @@ struct slider_definition : public control_definition
 {
 	explicit slider_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		unsigned minimum_positioner_length;
 		unsigned maximum_positioner_length;
diff --git a/src/gui/widgets/spacer.cpp b/src/gui/widgets/spacer.cpp
index b5402f24c57..03abd78a753 100644
--- a/src/gui/widgets/spacer.cpp
+++ b/src/gui/widgets/spacer.cpp
@@ -76,7 +76,7 @@ spacer_definition::spacer_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing spacer " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -93,7 +93,7 @@ spacer_definition::spacer_definition(const config& cfg)
  * @end{tag}{name="spacer_definition"}
  * @end{parent}{name="gui/"}
  */
-spacer_definition::tresolution::tresolution(const config& cfg)
+spacer_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 }
diff --git a/src/gui/widgets/spacer.hpp b/src/gui/widgets/spacer.hpp
index 06511bcbccc..8130d2049ce 100644
--- a/src/gui/widgets/spacer.hpp
+++ b/src/gui/widgets/spacer.hpp
@@ -89,9 +89,9 @@ struct spacer_definition : public control_definition
 {
 	explicit spacer_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/stacked_widget.cpp b/src/gui/widgets/stacked_widget.cpp
index 60352c432f4..15636494067 100644
--- a/src/gui/widgets/stacked_widget.cpp
+++ b/src/gui/widgets/stacked_widget.cpp
@@ -138,12 +138,12 @@ void stacked_widget::select_layer(const int layer)
 			// Select current layer, leave the rest unselected.
 			select_layer_internal(i, selected);
 			generator_->item(i).set_visible(selected
-											? widget::tvisible::visible
-											: widget::tvisible::hidden);
+											? widget::visibility::visible
+											: widget::visibility::hidden);
 		} else {
 			// Select everything.
 			select_layer_internal(i, true);
-			generator_->item(i).set_visible(widget::tvisible::visible);
+			generator_->item(i).set_visible(widget::visibility::visible);
 		}
 	}
 }
@@ -166,7 +166,7 @@ stacked_widget_definition::stacked_widget_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing stacked widget " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -189,7 +189,7 @@ stacked_widget_definition::stacked_widget_definition(const config& cfg)
  * @end{tag}{name="stacked_widget_definition"}
  * @end{parent}{name="gui/"}
  */
-stacked_widget_definition::tresolution::tresolution(const config& cfg)
+stacked_widget_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid(nullptr)
 {
 	// Add a dummy state since every widget needs a state.
@@ -250,8 +250,8 @@ widget* builder_stacked_widget::build() const
 	DBG_GUI_G << "Window builder: placed stacked widget '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const stacked_widget_definition::tresolution>
-	conf = std::static_pointer_cast<const stacked_widget_definition::tresolution>(
+	std::shared_ptr<const stacked_widget_definition::resolution>
+	conf = std::static_pointer_cast<const stacked_widget_definition::resolution>(
 					widget->config());
 	assert(conf);
 
diff --git a/src/gui/widgets/stacked_widget.hpp b/src/gui/widgets/stacked_widget.hpp
index d5431db5fda..a6b874651d7 100644
--- a/src/gui/widgets/stacked_widget.hpp
+++ b/src/gui/widgets/stacked_widget.hpp
@@ -116,9 +116,9 @@ struct stacked_widget_definition : public control_definition
 {
 	explicit stacked_widget_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
diff --git a/src/gui/widgets/text_box.cpp b/src/gui/widgets/text_box.cpp
index c652442b497..8ddb8a2ddc1 100644
--- a/src/gui/widgets/text_box.cpp
+++ b/src/gui/widgets/text_box.cpp
@@ -244,8 +244,8 @@ void text_box::update_offsets()
 {
 	assert(config());
 
-	std::shared_ptr<const text_box_definition::tresolution>
-	conf = std::static_pointer_cast<const text_box_definition::tresolution>(
+	std::shared_ptr<const text_box_definition::resolution>
+	conf = std::static_pointer_cast<const text_box_definition::resolution>(
 			config());
 
 	assert(conf);
@@ -328,8 +328,8 @@ void text_box::load_config_extra()
 {
 	assert(config());
 
-	std::shared_ptr<const text_box_definition::tresolution>
-	conf = std::static_pointer_cast<const text_box_definition::tresolution>(
+	std::shared_ptr<const text_box_definition::resolution>
+	conf = std::static_pointer_cast<const text_box_definition::resolution>(
 			config());
 
 	assert(conf);
@@ -402,7 +402,7 @@ text_box_definition::text_box_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing text_box " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -441,7 +441,7 @@ text_box_definition::text_box_definition(const config& cfg)
  * @end{tag}{name="ext_box_definition"}
  * @end{parent}{name="gui/"}
  */
-text_box_definition::tresolution::tresolution(const config& cfg)
+text_box_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, text_x_offset(cfg["text_x_offset"])
 	, text_y_offset(cfg["text_y_offset"])
diff --git a/src/gui/widgets/text_box.hpp b/src/gui/widgets/text_box.hpp
index 64bb5f6b620..eab8425c159 100644
--- a/src/gui/widgets/text_box.hpp
+++ b/src/gui/widgets/text_box.hpp
@@ -284,9 +284,9 @@ struct text_box_definition : public control_definition
 {
 	explicit text_box_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		typed_formula<unsigned> text_x_offset;
 		typed_formula<unsigned> text_y_offset;
diff --git a/src/gui/widgets/toggle_button.cpp b/src/gui/widgets/toggle_button.cpp
index 8ff26d453ea..6664f94516e 100644
--- a/src/gui/widgets/toggle_button.cpp
+++ b/src/gui/widgets/toggle_button.cpp
@@ -202,7 +202,7 @@ toggle_button_definition::toggle_button_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing toggle button " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -240,7 +240,7 @@ toggle_button_definition::toggle_button_definition(const config& cfg)
  * @end{tag}{name="oggle_button_definition"}
  * @end{parent}{name="gui/"}
  */
-toggle_button_definition::tresolution::tresolution(const config& cfg)
+toggle_button_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 {
 	// Note the order should be the same as the enum state_t in
diff --git a/src/gui/widgets/toggle_button.hpp b/src/gui/widgets/toggle_button.hpp
index ef5b021ddae..68e40ab963e 100644
--- a/src/gui/widgets/toggle_button.hpp
+++ b/src/gui/widgets/toggle_button.hpp
@@ -149,9 +149,9 @@ struct toggle_button_definition : public control_definition
 {
 	explicit toggle_button_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 	};
 };
 
diff --git a/src/gui/widgets/toggle_panel.cpp b/src/gui/widgets/toggle_panel.cpp
index 9a961a78fed..cb92309cf97 100644
--- a/src/gui/widgets/toggle_panel.cpp
+++ b/src/gui/widgets/toggle_panel.cpp
@@ -141,9 +141,9 @@ unsigned toggle_panel::get_state() const
 
 SDL_Rect toggle_panel::get_client_rect() const
 {
-	std::shared_ptr<const toggle_panel_definition::tresolution> conf
+	std::shared_ptr<const toggle_panel_definition::resolution> conf
 			= std::static_pointer_cast<const toggle_panel_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 
 	SDL_Rect result = get_rectangle();
@@ -157,9 +157,9 @@ SDL_Rect toggle_panel::get_client_rect() const
 
 point toggle_panel::border_space() const
 {
-	std::shared_ptr<const toggle_panel_definition::tresolution> conf
+	std::shared_ptr<const toggle_panel_definition::resolution> conf
 			= std::static_pointer_cast<const toggle_panel_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 
 	return point(conf->left_border + conf->right_border, conf->top_border + conf->bottom_border);
@@ -188,9 +188,9 @@ void toggle_panel::set_state(const state_t state)
 	state_ = state;
 	set_is_dirty(true);
 
-	std::shared_ptr<const toggle_panel_definition::tresolution> conf
+	std::shared_ptr<const toggle_panel_definition::resolution> conf
 			= std::static_pointer_cast<const toggle_panel_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 }
 
@@ -309,7 +309,7 @@ toggle_panel_definition::toggle_panel_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing toggle panel " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -361,7 +361,7 @@ toggle_panel_definition::toggle_panel_definition(const config& cfg)
  * @end{tag}{name="oggle_panel_definition"}
  * @end{parent}{name="gui/"}
  */
-toggle_panel_definition::tresolution::tresolution(const config& cfg)
+toggle_panel_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, top_border(cfg["top_border"])
 	, bottom_border(cfg["bottom_border"])
diff --git a/src/gui/widgets/toggle_panel.hpp b/src/gui/widgets/toggle_panel.hpp
index 9e5dc56edf3..8ef4817dbac 100644
--- a/src/gui/widgets/toggle_panel.hpp
+++ b/src/gui/widgets/toggle_panel.hpp
@@ -192,9 +192,9 @@ struct toggle_panel_definition : public control_definition
 {
 	explicit toggle_panel_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		unsigned top_border;
 		unsigned bottom_border;
diff --git a/src/gui/widgets/tree_view.cpp b/src/gui/widgets/tree_view.cpp
index 507be8c2a5d..bb47ef847b3 100644
--- a/src/gui/widgets/tree_view.cpp
+++ b/src/gui/widgets/tree_view.cpp
@@ -273,7 +273,7 @@ tree_view_definition::tree_view_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing tree view " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -301,7 +301,7 @@ tree_view_definition::tree_view_definition(const config& cfg)
  * @end{tag}{name="ree_view_definition"}
  * @end{parent}{name="gui/"}
  */
-tree_view_definition::tresolution::tresolution(const config& cfg)
+tree_view_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid(nullptr)
 {
 	// Note the order should be the same as the enum state_t is listbox.hpp.
@@ -384,7 +384,7 @@ builder_tree_view::builder_tree_view(const config& cfg)
 
 	for(const auto & node : cfg.child_range("node"))
 	{
-		nodes.push_back(ttree_node(node));
+		nodes.push_back(tree_node(node));
 	}
 
 	VALIDATE(!nodes.empty(), _("No nodes defined for a tree view."));
@@ -408,8 +408,8 @@ widget* builder_tree_view::build() const
 	DBG_GUI_G << "Window builder: placed tree_view '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const tree_view_definition::tresolution>
-	conf = std::static_pointer_cast<const tree_view_definition::tresolution>(
+	std::shared_ptr<const tree_view_definition::resolution>
+	conf = std::static_pointer_cast<const tree_view_definition::resolution>(
 					widget->config());
 	assert(conf);
 
@@ -419,7 +419,7 @@ widget* builder_tree_view::build() const
 	return widget;
 }
 
-ttree_node::ttree_node(const config& cfg)
+tree_node::tree_node(const config& cfg)
 	: id(cfg["id"])
 	, unfolded(cfg["unfolded"].to_bool(false))
 	, builder(nullptr)
diff --git a/src/gui/widgets/tree_view.hpp b/src/gui/widgets/tree_view.hpp
index 9a05fd7888e..f687a04367b 100644
--- a/src/gui/widgets/tree_view.hpp
+++ b/src/gui/widgets/tree_view.hpp
@@ -22,9 +22,9 @@ namespace gui2
 
 namespace implementation {
 	struct builder_tree_view;
-	struct ttree_node
+	struct tree_node
 	{
-		explicit ttree_node(const config& cfg);
+		explicit tree_node(const config& cfg);
 
 		std::string id;
 		bool unfolded;
@@ -42,7 +42,7 @@ class tree_view : public scrollbar_container
 	friend class tree_view_node;
 
 public:
-	typedef implementation::ttree_node node_definition;
+	typedef implementation::tree_node node_definition;
 
 	explicit tree_view(const std::vector<node_definition>& node_definitions);
 
@@ -178,9 +178,9 @@ struct tree_view_definition : public control_definition
 
 	explicit tree_view_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
@@ -199,8 +199,8 @@ struct builder_tree_view : public builder_control
 
 	widget* build() const;
 
-	scrollbar_container::tscrollbar_mode vertical_scrollbar_mode;
-	scrollbar_container::tscrollbar_mode horizontal_scrollbar_mode;
+	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
+	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
 
 	unsigned indentation_step_size;
 
@@ -210,7 +210,7 @@ struct builder_tree_view : public builder_control
 	 * Since we expect the amount of nodes to remain low it's stored in a
 	 * vector and not in a map.
 	 */
-	std::vector<ttree_node> nodes;
+	std::vector<tree_node> nodes;
 
 	/*
 	 * NOTE this class doesn't have a data section, so it can only be filled
diff --git a/src/gui/widgets/tree_view_node.cpp b/src/gui/widgets/tree_view_node.cpp
index ff609ad1c62..c475c0e20aa 100644
--- a/src/gui/widgets/tree_view_node.cpp
+++ b/src/gui/widgets/tree_view_node.cpp
@@ -67,7 +67,7 @@ tree_view_node::tree_view_node(
 		init_grid(&grid_, data);
 
 		if(parent_node_ && parent_node_->toggle_) {
-			dynamic_cast<widget&>(*parent_node_->toggle_).set_visible(widget::tvisible::visible);
+			dynamic_cast<widget&>(*parent_node_->toggle_).set_visible(widget::visibility::visible);
 		}
 
 		if(node_definition.unfolded) {
@@ -78,7 +78,7 @@ tree_view_node::tree_view_node(
 		toggle_ = dynamic_cast<selectable_item*>(toggle_widget);
 
 		if(toggle_) {
-			toggle_widget->set_visible(widget::tvisible::hidden);
+			toggle_widget->set_visible(widget::visibility::hidden);
 
 			toggle_widget->connect_signal<event::LEFT_BUTTON_CLICK>(std::bind(
 					&tree_view_node::signal_handler_left_button_click, this, _2));
@@ -388,7 +388,7 @@ point tree_view_node::get_current_size(bool assume_visible) const
 	}
 
 	for(const auto& node : children_) {
-		if(node.grid_.get_visible() == widget::tvisible::invisible) {
+		if(node.grid_.get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -418,7 +418,7 @@ point tree_view_node::get_unfolded_size() const
 	}
 
 	for(const auto& node : children_) {
-		if(node.grid_.get_visible() == widget::tvisible::invisible) {
+		if(node.grid_.get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
@@ -444,7 +444,7 @@ point tree_view_node::calculate_best_size(const int indentation_level,
 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
 
 	for(const auto& node : children_) {
-		if(node.grid_.get_visible() == widget::tvisible::invisible) {
+		if(node.grid_.get_visible() == widget::visibility::invisible) {
 			continue;
 		}
 
diff --git a/src/gui/widgets/tree_view_node.hpp b/src/gui/widgets/tree_view_node.hpp
index 923d2d4723f..a64c47320b2 100644
--- a/src/gui/widgets/tree_view_node.hpp
+++ b/src/gui/widgets/tree_view_node.hpp
@@ -25,7 +25,7 @@ namespace gui2
 {
 
 namespace implementation {
-	struct ttree_node;
+	struct tree_node;
 }
 
 class selectable_item;
@@ -37,7 +37,7 @@ class tree_view_node : public widget
 	friend class tree_view;
 
 public:
-	using node_definition = implementation::ttree_node;
+	using node_definition = implementation::tree_node;
 	using node_children_vector = boost::ptr_vector<tree_view_node>;
 
 	bool operator==(const tree_view_node& node)
@@ -128,7 +128,7 @@ public:
 
 #if 0
 	// TODO: implement if different expand modes become necessary
-	enum texpand_mode {
+	enum expand_mode {
 		recursive_restore, // recursively restores collapse mode
 		recursive_expand, // recursively expands the children
 		not_recursive
diff --git a/src/gui/widgets/unit_preview_pane.cpp b/src/gui/widgets/unit_preview_pane.cpp
index 21495e1abeb..c60a71b6ab4 100644
--- a/src/gui/widgets/unit_preview_pane.cpp
+++ b/src/gui/widgets/unit_preview_pane.cpp
@@ -446,10 +446,10 @@ unit_preview_pane_definition::unit_preview_pane_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing unit preview pane " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
-unit_preview_pane_definition::tresolution::tresolution(const config& cfg)
+unit_preview_pane_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg), grid()
 {
 	state.push_back(state_definition(cfg.child("background")));
@@ -481,9 +481,9 @@ widget* builder_unit_preview_pane::build() const
 	DBG_GUI_G << "Window builder: placed unit preview pane '" << id
 			  << "' with definition '" << definition << "'.\n";
 
-	std::shared_ptr<const unit_preview_pane_definition::tresolution> conf
+	std::shared_ptr<const unit_preview_pane_definition::resolution> conf
 		= std::static_pointer_cast<
-			const unit_preview_pane_definition::tresolution>(widget->config());
+			const unit_preview_pane_definition::resolution>(widget->config());
 
 	assert(conf);
 
diff --git a/src/gui/widgets/unit_preview_pane.hpp b/src/gui/widgets/unit_preview_pane.hpp
index abf0452362e..787da239675 100644
--- a/src/gui/widgets/unit_preview_pane.hpp
+++ b/src/gui/widgets/unit_preview_pane.hpp
@@ -129,9 +129,9 @@ struct unit_preview_pane_definition : public control_definition
 
 	explicit unit_preview_pane_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
diff --git a/src/gui/widgets/vertical_scrollbar.cpp b/src/gui/widgets/vertical_scrollbar.cpp
index b26c0283bed..f4d555fba74 100644
--- a/src/gui/widgets/vertical_scrollbar.cpp
+++ b/src/gui/widgets/vertical_scrollbar.cpp
@@ -30,36 +30,36 @@ REGISTER_WIDGET(vertical_scrollbar)
 
 unsigned vertical_scrollbar::minimum_positioner_length() const
 {
-	std::shared_ptr<const vertical_scrollbar_definition::tresolution> conf
+	std::shared_ptr<const vertical_scrollbar_definition::resolution> conf
 			= std::static_pointer_cast<const vertical_scrollbar_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 	return conf->minimum_positioner_length;
 }
 
 unsigned vertical_scrollbar::maximum_positioner_length() const
 {
-	std::shared_ptr<const vertical_scrollbar_definition::tresolution> conf
+	std::shared_ptr<const vertical_scrollbar_definition::resolution> conf
 			= std::static_pointer_cast<const vertical_scrollbar_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 	return conf->maximum_positioner_length;
 }
 
 unsigned vertical_scrollbar::offset_before() const
 {
-	std::shared_ptr<const vertical_scrollbar_definition::tresolution> conf
+	std::shared_ptr<const vertical_scrollbar_definition::resolution> conf
 			= std::static_pointer_cast<const vertical_scrollbar_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 	return conf->top_offset;
 }
 
 unsigned vertical_scrollbar::offset_after() const
 {
-	std::shared_ptr<const vertical_scrollbar_definition::tresolution> conf
+	std::shared_ptr<const vertical_scrollbar_definition::resolution> conf
 			= std::static_pointer_cast<const vertical_scrollbar_definition::
-												  tresolution>(config());
+												  resolution>(config());
 	assert(conf);
 	return conf->bottom_offset;
 }
@@ -111,7 +111,7 @@ vertical_scrollbar_definition::vertical_scrollbar_definition(
 {
 	DBG_GUI_P << "Parsing vertical scrollbar " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
 /*WIKI
@@ -162,7 +162,7 @@ vertical_scrollbar_definition::vertical_scrollbar_definition(
  * @end{tag}{name="vertical_scrollbar_definition"}
  * @end{parent}{name="gui/"}
  */
-vertical_scrollbar_definition::tresolution::tresolution(const config& cfg)
+vertical_scrollbar_definition::resolution::resolution(const config& cfg)
 	: resolution_definition(cfg)
 	, minimum_positioner_length(cfg["minimum_positioner_length"])
 	, maximum_positioner_length(cfg["maximum_positioner_length"])
diff --git a/src/gui/widgets/vertical_scrollbar.hpp b/src/gui/widgets/vertical_scrollbar.hpp
index 561b67d26a1..c8208e2e6d2 100644
--- a/src/gui/widgets/vertical_scrollbar.hpp
+++ b/src/gui/widgets/vertical_scrollbar.hpp
@@ -74,9 +74,9 @@ struct vertical_scrollbar_definition : public control_definition
 {
 	explicit vertical_scrollbar_definition(const config& cfg);
 
-	struct tresolution : public resolution_definition
+	struct resolution : public resolution_definition
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		unsigned minimum_positioner_length;
 		unsigned maximum_positioner_length;
diff --git a/src/gui/widgets/viewport.cpp b/src/gui/widgets/viewport.cpp
index 3e27529498f..8412b9862f3 100644
--- a/src/gui/widgets/viewport.cpp
+++ b/src/gui/widgets/viewport.cpp
@@ -35,7 +35,7 @@ namespace gui2
  * functions. It also facilitates to create duplicates of functions for a const
  * and a non-const member function.
  */
-struct tviewport_implementation
+struct viewport_implementation
 {
 	/**
 	 * Implementation for the wrappers for
@@ -115,7 +115,7 @@ void viewport::layout_initialise(const bool full_initialisation)
 {
 	widget::layout_initialise(full_initialisation);
 
-	if(widget_.get_visible() != widget::tvisible::invisible) {
+	if(widget_.get_visible() != widget::visibility::invisible) {
 		widget_.layout_initialise(full_initialisation);
 	}
 }
@@ -126,7 +126,7 @@ viewport::impl_draw_children(surface& frame_buffer, int x_offset, int y_offset)
 	x_offset += get_x();
 	y_offset += get_y();
 
-	if(widget_.get_visible() != widget::tvisible::invisible) {
+	if(widget_.get_visible() != widget::visibility::invisible) {
 		widget_.draw_background(frame_buffer, x_offset, y_offset);
 		widget_.draw_children(frame_buffer, x_offset, y_offset);
 		widget_.draw_foreground(frame_buffer, x_offset, y_offset);
@@ -148,24 +148,24 @@ void viewport::request_reduce_width(const unsigned /*maximum_width*/)
 
 widget* viewport::find_at(const point& coordinate, const bool must_be_active)
 {
-	return tviewport_implementation::find_at(this, coordinate, must_be_active);
+	return viewport_implementation::find_at(this, coordinate, must_be_active);
 }
 
 const widget* viewport::find_at(const point& coordinate,
 								  const bool must_be_active) const
 {
-	return tviewport_implementation::find_at(this, coordinate, must_be_active);
+	return viewport_implementation::find_at(this, coordinate, must_be_active);
 }
 
 widget* viewport::find(const std::string& id, const bool must_be_active)
 {
-	return tviewport_implementation::find(this, id, must_be_active);
+	return viewport_implementation::find(this, id, must_be_active);
 }
 
 const widget* viewport::find(const std::string& id, const bool must_be_active)
 		const
 {
-	return tviewport_implementation::find(this, id, must_be_active);
+	return viewport_implementation::find(this, id, must_be_active);
 }
 
 point viewport::calculate_best_size() const
diff --git a/src/gui/widgets/viewport.hpp b/src/gui/widgets/viewport.hpp
index 4ac8e97f0ed..0ba5569b8a8 100644
--- a/src/gui/widgets/viewport.hpp
+++ b/src/gui/widgets/viewport.hpp
@@ -32,7 +32,7 @@ class grid;
 
 class viewport : public widget
 {
-	friend struct tviewport_implementation;
+	friend struct viewport_implementation;
 
 public:
 	/** @deprecated use the second overload. */
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index d789e8718c2..d2d939ad97f 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -38,8 +38,8 @@ widget::widget()
 #endif
 	, linked_group_()
 	, is_dirty_(true)
-	, visible_(tvisible::visible)
-	, redraw_action_(tredraw_action::full)
+	, visible_(visibility::visible)
+	, redraw_action_(redraw_action::full)
 	, clipping_rectangle_()
 #ifndef LOW_MEM
 	, debug_border_mode_(0)
@@ -62,8 +62,8 @@ widget::widget(const builder_widget& builder)
 #endif
 	, linked_group_(builder.linked_group)
 	, is_dirty_(true)
-	, visible_(tvisible::visible)
-	, redraw_action_(tredraw_action::full)
+	, visible_(visibility::visible)
+	, redraw_action_(redraw_action::full)
 	, clipping_rectangle_()
 #ifndef LOW_MEM
 	, debug_border_mode_(builder.debug_border_mode)
@@ -161,7 +161,7 @@ widget* widget::parent()
 
 void widget::layout_initialise(const bool /*full_initialisation*/)
 {
-	assert(visible_ != tvisible::invisible);
+	assert(visible_ != visibility::invisible);
 	assert(get_window());
 
 	layout_size_ = point();
@@ -187,7 +187,7 @@ void widget::demand_reduce_height(const unsigned /*maximum_height*/)
 
 point widget::get_best_size() const
 {
-	assert(visible_ != tvisible::invisible);
+	assert(visible_ != visibility::invisible);
 
 	point result = layout_size_;
 	if(result == point()) {
@@ -338,9 +338,9 @@ SDL_Rect widget::calculate_clipping_rectangle(const int x_offset,
 
 void widget::draw_background(surface& frame_buffer, int x_offset, int y_offset)
 {
-	assert(visible_ == tvisible::visible);
+	assert(visible_ == visibility::visible);
 
-	if(redraw_action_ == tredraw_action::partly) {
+	if(redraw_action_ == redraw_action::partly) {
 		const SDL_Rect clipping_rectangle
 				= calculate_clipping_rectangle(x_offset, y_offset);
 
@@ -355,9 +355,9 @@ void widget::draw_background(surface& frame_buffer, int x_offset, int y_offset)
 
 void widget::draw_children(surface& frame_buffer, int x_offset, int y_offset)
 {
-	assert(visible_ == tvisible::visible);
+	assert(visible_ == visibility::visible);
 
-	if(redraw_action_ == tredraw_action::partly) {
+	if(redraw_action_ == redraw_action::partly) {
 		const SDL_Rect clipping_rectangle
 				= calculate_clipping_rectangle(x_offset, y_offset);
 
@@ -370,9 +370,9 @@ void widget::draw_children(surface& frame_buffer, int x_offset, int y_offset)
 
 void widget::draw_foreground(surface& frame_buffer, int x_offset, int y_offset)
 {
-	assert(visible_ == tvisible::visible);
+	assert(visible_ == visibility::visible);
 
-	if(redraw_action_ == tredraw_action::partly) {
+	if(redraw_action_ == redraw_action::partly) {
 		const SDL_Rect clipping_rectangle
 				= calculate_clipping_rectangle(x_offset, y_offset);
 
@@ -388,11 +388,11 @@ void widget::populate_dirty_list(window& caller,
 {
 	assert(call_stack.empty() || call_stack.back() != this);
 
-	if(visible_ != tvisible::visible) {
+	if(visible_ != visibility::visible) {
 		return;
 	}
 
-	if(get_drawing_action() == tredraw_action::none) {
+	if(get_drawing_action() == redraw_action::none) {
 		return;
 	}
 
@@ -415,7 +415,7 @@ widget::child_populate_dirty_list(window& /*caller*/
 
 SDL_Rect widget::get_dirty_rectangle() const
 {
-	return redraw_action_ == tredraw_action::full ? get_rectangle()
+	return redraw_action_ == redraw_action::full ? get_rectangle()
 												  : clipping_rectangle_;
 }
 
@@ -424,11 +424,11 @@ void widget::set_visible_rectangle(const SDL_Rect& rectangle)
 	clipping_rectangle_ = sdl::intersect_rects(rectangle, get_rectangle());
 
 	if(clipping_rectangle_ == get_rectangle()) {
-		redraw_action_ = tredraw_action::full;
+		redraw_action_ = redraw_action::full;
 	} else if(clipping_rectangle_ == sdl::empty_rect) {
-		redraw_action_ = tredraw_action::none;
+		redraw_action_ = redraw_action::none;
 	} else {
-		redraw_action_ = tredraw_action::partly;
+		redraw_action_ = redraw_action::partly;
 	}
 }
 
@@ -442,15 +442,15 @@ bool widget::get_is_dirty() const
 	return is_dirty_;
 }
 
-void widget::set_visible(const tvisible visible)
+void widget::set_visible(const visibility visible)
 {
 	if(visible == visible_) {
 		return;
 	}
 
 	// Switching to or from invisible should invalidate the layout.
-	const bool need_resize = visible_ == tvisible::invisible
-							 || visible == tvisible::invisible;
+	const bool need_resize = visible_ == visibility::invisible
+							 || visible == visibility::invisible;
 	visible_ = visible;
 
 	if(need_resize) {
@@ -468,14 +468,14 @@ void widget::set_visible(const tvisible visible)
 	}
 }
 
-widget::tvisible widget::get_visible() const
+widget::visibility widget::get_visible() const
 {
 	return visible_;
 }
 
-widget::tredraw_action widget::get_drawing_action() const
+widget::redraw_action widget::get_drawing_action() const
 {
-	return (width_ == 0 || height_ == 0) ? tredraw_action::none
+	return (width_ == 0 || height_ == 0) ? redraw_action::none
 										 : redraw_action_;
 }
 
@@ -493,7 +493,7 @@ void widget::set_debug_border_colour(const unsigned debug_border_colour)
 
 void widget::draw_debug_border(surface& frame_buffer)
 {
-	SDL_Rect r = redraw_action_ == tredraw_action::partly ? clipping_rectangle_
+	SDL_Rect r = redraw_action_ == redraw_action::partly ? clipping_rectangle_
 														  : get_rectangle();
 
 	switch(debug_border_mode_) {
@@ -517,7 +517,7 @@ void widget::draw_debug_border(surface& frame_buffer)
 void
 widget::draw_debug_border(surface& frame_buffer, int x_offset, int y_offset)
 {
-	SDL_Rect r = redraw_action_ == tredraw_action::partly
+	SDL_Rect r = redraw_action_ == redraw_action::partly
 						 ? calculate_clipping_rectangle(x_offset, y_offset)
 						 : calculate_blitting_rectangle(x_offset, y_offset);
 
@@ -579,8 +579,8 @@ bool widget::is_at(const point& coordinate) const
 bool widget::recursive_is_visible(const widget* widget, const bool must_be_active) const
 {
 	while(widget) {
-		if(widget->visible_ == tvisible::invisible
-		   || (widget->visible_ == tvisible::hidden && must_be_active)) {
+		if(widget->visible_ == visibility::invisible
+		   || (widget->visible_ == visibility::hidden && must_be_active)) {
 			return false;
 		}
 
diff --git a/src/gui/widgets/widget.hpp b/src/gui/widgets/widget.hpp
index 501081498e3..50663a4fa55 100644
--- a/src/gui/widgets/widget.hpp
+++ b/src/gui/widgets/widget.hpp
@@ -58,7 +58,7 @@ class widget : private boost::noncopyable,
 
 public:
 	/** Visibility settings done by the user. */
-	enum class tvisible 
+	enum class visibility 
 	{
 		/**
 		 * The user sets the widget visible, that means:
@@ -100,10 +100,10 @@ public:
 	/**
 	 * Visibility set by the engine.
 	 *
-	 * This state only will be used if @ref visible_ is @ref tvisible::visible
+	 * This state only will be used if @ref visible_ is @ref visibility::visible
 	 * depending on this state the widget might not be visible after all.
 	 */
-	enum class tredraw_action
+	enum class redraw_action
 	{
 		/**
 		 * The widget is fully visible.
@@ -245,7 +245,7 @@ public:
 	 *
 	 * @param full_initialisation For widgets with scrollbars it hides them
 	 *                            unless the mode is
-	 *                            @ref tscrollbar_mode::ALWAYS_VISIBLE. For
+	 *                            @ref scrollbar_mode::ALWAYS_VISIBLE. For
 	 *                            other widgets this flag is a @em NOP.
 	 */
 	virtual void layout_initialise(const bool full_initialisation);
@@ -510,7 +510,7 @@ public:
 	 * Calculates the clipping rectangle of the widget.
 	 *
 	 * The clipping rectangle is used then the @ref redraw_action_ is
-	 * @ref tredraw_action::partly. Since the drawing can be offsetted it also
+	 * @ref redraw_action::partly. Since the drawing can be offsetted it also
 	 * needs offset paramters.
 	 *
 	 * @param x_offset            The offset in the x-direction when drawn.
@@ -659,10 +659,10 @@ public:
 	void set_is_dirty(const bool is_dirty);
 	bool get_is_dirty() const;
 
-	void set_visible(const tvisible visible);
-	tvisible get_visible() const;
+	void set_visible(const visibility visible);
+	visibility get_visible() const;
 
-	tredraw_action get_drawing_action() const;
+	redraw_action get_drawing_action() const;
 
 #ifndef LOW_MEM
 
@@ -687,10 +687,10 @@ private:
 	bool is_dirty_;
 
 	/** Field for the status of the visibility. */
-	tvisible visible_;
+	visibility visible_;
 
 	/** Field for the action to do on a drawing request. */
-	tredraw_action redraw_action_;
+	redraw_action redraw_action_;
 
 	/** The clipping rectangle if a widget is partly visible. */
 	SDL_Rect clipping_rectangle_;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 47507910656..34ac20ae650 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -493,7 +493,7 @@ void window::update_screen_size()
  * * cancel cancels the dialog.
  *
  */
-window::tretval window::get_retval_by_id(const std::string& id)
+window::retval window::get_retval_by_id(const std::string& id)
 {
 	// Note it might change to a map later depending on the number
 	// of items.
@@ -568,10 +568,10 @@ int window::show(const bool restore, const unsigned auto_close_timeout)
 	 * We need to make sure we restore the value when the function ends, be it
 	 * normally or due to an exception.
 	 */
-	class tdraw_interval_setter
+	class draw_interval_setter
 	{
 	public:
-		tdraw_interval_setter() : interval_(draw_interval)
+		draw_interval_setter() : interval_(draw_interval)
 		{
 			if(interval_ == 0) {
 				draw_interval = 20;
@@ -583,7 +583,7 @@ int window::show(const bool restore, const unsigned auto_close_timeout)
 			}
 		}
 
-		~tdraw_interval_setter()
+		~draw_interval_setter()
 		{
 			draw_interval = interval_;
 		}
@@ -598,7 +598,7 @@ int window::show(const bool restore, const unsigned auto_close_timeout)
 
 	assert(status_ == NEW);
 
-	tdraw_interval_setter draw_interval_setter;
+	draw_interval_setter draw_interval_setter;
 
 	/*
 	 * Before show has been called, some functions might have done some testing
@@ -802,8 +802,8 @@ void window::draw()
 		 *
 		 * Before drawing there needs to be determined whether a dirty widget
 		 * really needs to be redrawn. If the widget doesn't need to be
-		 * redrawing either being not tvisible::visible or has status
-		 * widget::tredraw_action::none. If it's not drawn it's still set not
+		 * redrawing either being not visibility::visible or has status
+		 * widget::redraw_action::none. If it's not drawn it's still set not
 		 * dirty to avoid it keep getting on the dirty list.
 		 */
 
@@ -811,9 +811,9 @@ void window::draw()
 			itor != item.end();
 			++itor) {
 
-			if((**itor).get_visible() != widget::tvisible::visible
+			if((**itor).get_visible() != widget::visibility::visible
 			   || (**itor).get_drawing_action()
-				  == widget::tredraw_action::none) {
+				  == widget::redraw_action::none) {
 
 				for(std::vector<widget*>::iterator citor = itor;
 					citor != item.end();
@@ -879,14 +879,14 @@ void window::undraw()
 	}
 }
 
-window::tinvalidate_layout_blocker::tinvalidate_layout_blocker(window& window)
+window::invalidate_layout_blocker::invalidate_layout_blocker(window& window)
 	: window_(window)
 {
 	assert(!window_.invalidate_layout_blocked_);
 	window_.invalidate_layout_blocked_ = true;
 }
 
-window::tinvalidate_layout_blocker::~tinvalidate_layout_blocker()
+window::invalidate_layout_blocker::~invalidate_layout_blocker()
 {
 	assert(window_.invalidate_layout_blocked_);
 	window_.invalidate_layout_blocked_ = false;
@@ -927,7 +927,7 @@ void window::init_linked_size_group(const std::string& id,
 	assert(fixed_width || fixed_height);
 	assert(!has_linked_size_group(id));
 
-	linked_size_[id] = tlinked_size(fixed_width, fixed_height);
+	linked_size_[id] = linked_size(fixed_width, fixed_height);
 }
 
 bool window::has_linked_size_group(const std::string& id)
@@ -973,8 +973,8 @@ void window::layout()
 {
 	/***** Initialize. *****/
 
-	std::shared_ptr<const window_definition::tresolution>
-	conf = std::static_pointer_cast<const window_definition::tresolution>(
+	std::shared_ptr<const window_definition::resolution>
+	conf = std::static_pointer_cast<const window_definition::resolution>(
 			config());
 	assert(conf);
 
@@ -1003,12 +1003,12 @@ void window::layout()
 	if((click_dismiss_button
 		= find_widget<button>(this, "click_dismiss", false, false))) {
 
-		click_dismiss_button->set_visible(widget::tvisible::invisible);
+		click_dismiss_button->set_visible(widget::visibility::invisible);
 	}
 	if(click_dismiss_) {
 		button* btn = find_widget<button>(this, "ok", false, false);
 		if(btn) {
-			btn->set_visible(widget::tvisible::invisible);
+			btn->set_visible(widget::visibility::invisible);
 			click_dismiss_button = btn;
 		}
 		VALIDATE(click_dismiss_button,
@@ -1045,7 +1045,7 @@ void window::layout()
 	/****** Validate click dismiss status. *****/
 	if(click_dismiss_ && disable_click_dismiss()) {
 		assert(click_dismiss_button);
-		click_dismiss_button->set_visible(widget::tvisible::visible);
+		click_dismiss_button->set_visible(widget::visibility::visible);
 
 		connect_signal_mouse_left_click(
 				*click_dismiss_button,
@@ -1484,11 +1484,11 @@ window_definition::window_definition(const config& cfg)
 {
 	DBG_GUI_P << "Parsing window " << id << '\n';
 
-	load_resolutions<tresolution>(cfg);
+	load_resolutions<resolution>(cfg);
 }
 
-window_definition::tresolution::tresolution(const config& cfg)
-	: panel_definition::tresolution(cfg), grid(nullptr)
+window_definition::resolution::resolution(const config& cfg)
+	: panel_definition::resolution(cfg), grid(nullptr)
 {
 	const config& child = cfg.child("grid");
 	// VALIDATE(child, _("No grid defined."));
@@ -1524,7 +1524,7 @@ window_definition::tresolution::tresolution(const config& cfg)
  *   one or more widgets.  Several widgets have a grid in them to hold
  *   multiple widgets eg panels and windows.
  *
- * - @ref gui2::grid::tchild "Grid cell"; Every widget which is in a grid is
+ * - @ref gui2::grid::child "Grid cell"; Every widget which is in a grid is
  *   put in a grid cell. These cells also hold the information about the gaps
  *   between widgets the behavior on growing etc. All grid cells must have a
  *   widget inside them.
@@ -1533,7 +1533,7 @@ window_definition::tresolution::tresolution(const config& cfg)
  *   grid with its children. The window handles the sizing of the window and
  *   makes sure everything fits.
  *
- * - @ref gui2::window::tlinked_size "Shared size group"; A shared size
+ * - @ref gui2::window::linked_size "Shared size group"; A shared size
  *   group is a number of widgets which share width and or height. These
  *   widgets are handled separately in the layout algorithm. All grid cells
  *   width such a widget will get the same height and or width and these
@@ -1544,14 +1544,14 @@ window_definition::tresolution::tresolution(const config& cfg)
  *   layout property must be set by the engine after validation.
  *
  * - All visible grid cells; A grid cell is visible when the widget inside
- *   of it doesn't have the state tvisible::invisible. Widgets which have the
- *   state @ref tvisible::hidden are sized properly since when they become
- *   @ref tvisible::visible the layout shouldn't be invalidated. A grid cell
+ *   of it doesn't have the state visibility::invisible. Widgets which have the
+ *   state @ref visibility::hidden are sized properly since when they become
+ *   @ref visibility::visible the layout shouldn't be invalidated. A grid cell
  *   that's invisible has size 0,0.
  *
  * - All resizable grid cells; A grid cell is resizable under the following
  *   conditions:
- *   - The widget is tvisible::visible.
+ *   - The widget is visibility::visible.
  *   - The widget is not in a shared size group.
  *
  * There are two layout algorithms with a different purpose.
@@ -1573,7 +1573,7 @@ window_definition::tresolution::tresolution(const config& cfg)
  *   (@ref gui2::widget::layout_initialise (full_initialisation = true)):
  *   - Clear the internal best size cache for all widgets.
  *   - For widgets with scrollbars hide them unless the
- *     @ref gui2::scrollbar_container::tscrollbar_mode "scrollbar_mode" is
+ *     @ref gui2::scrollbar_container::scrollbar_mode "scrollbar_mode" is
  *     ALWAYS_VISIBLE or AUTO_VISIBLE.
  * - Handle shared sizes:
  *   - Height and width:
diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp
index 8cd11e7a837..940f69ced40 100644
--- a/src/gui/widgets/window.hpp
+++ b/src/gui/widgets/window.hpp
@@ -63,7 +63,7 @@ class window : public panel, public cursor::setter
 	friend class debug_layout_graph;
 	friend window* build(CVideo&, const builder_window::window_resolution*);
 	friend struct window_implementation;
-	friend class tinvalidate_layout_blocker;
+	friend class invalidate_layout_blocker;
 	friend class pane;
 
 public:
@@ -115,7 +115,7 @@ public:
 	 * include the button, while it should be and implementation detail for most
 	 * callers.
 	 */
-	enum tretval {
+	enum retval {
 		NONE = 0, /**<
 				   * Dialog is closed with no return
 				   * value, should be rare but eg a
@@ -134,7 +134,7 @@ public:
 	};
 
 	/** Gets the retval for the default buttons. */
-	static tretval get_retval_by_id(const std::string& id);
+	static retval get_retval_by_id(const std::string& id);
 
 	/**
 	 * @todo Clean up the show functions.
@@ -154,7 +154,7 @@ public:
 	 *                            after the minimum.
 	 *
 	 * @returns                   The close code of the window, predefined
-	 *                            values are listed in tretval.
+	 *                            values are listed in retval.
 	 */
 	int show(const bool restore = true, const unsigned auto_close_timeout = 0);
 
@@ -215,7 +215,7 @@ public:
 	}
 
 	/** The status of the window. */
-	enum tstatus {
+	enum status {
 		NEW,		   /**< The window is new and not yet shown. */
 		SHOWING,	   /**< The window is being shown. */
 		REQUEST_CLOSE, /**< The window has been requested to be
@@ -246,11 +246,11 @@ public:
 	 *
 	 * @note The class can't be used recursively.
 	 */
-	class tinvalidate_layout_blocker
+	class invalidate_layout_blocker
 	{
 	public:
-		tinvalidate_layout_blocker(window& window);
-		~tinvalidate_layout_blocker();
+		invalidate_layout_blocker(window& window);
+		~invalidate_layout_blocker();
 
 	private:
 		window& window_;
@@ -457,7 +457,7 @@ public:
 	}
 	point get_linked_size(const std::string& linked_group_id) const
 	{
-		std::map<std::string, tlinked_size>::const_iterator it = linked_size_.find(linked_group_id);
+		std::map<std::string, linked_size>::const_iterator it = linked_size_.find(linked_group_id);
 		if(it != linked_size_.end()) {
 			return point(it->second.width, it->second.height);
 		}
@@ -494,9 +494,9 @@ private:
 	CVideo& video_;
 
 	/** The status of the window. */
-	tstatus status_;
+	status status_;
 
-	enum tshow_mode {
+	enum show_mode {
 		none,
 		modal,
 		tooltip
@@ -507,7 +507,7 @@ private:
 	 *
 	 * This is used to determine whether or not to remove the tip.
 	 */
-	tshow_mode show_mode_;
+	show_mode show_mode_;
 
 	// return value of the window, 0 default.
 	int retval_;
@@ -526,7 +526,7 @@ private:
 	/** The variables of the canvas. */
 	game_logic::map_formula_callable variables_;
 
-	/** Is invalidate layout blocked see tinvalidate_layout_blocker. */
+	/** Is invalidate layout blocked see invalidate_layout_blocker. */
 	bool invalidate_layout_blocked_;
 
 	/** Avoid drawing the window.  */
@@ -628,9 +628,9 @@ private:
 	 * can especially be useful for listboxes, but can also be used for other
 	 * applications.
 	 */
-	struct tlinked_size
+	struct linked_size
 	{
-		tlinked_size(const bool width = false, const bool height = false)
+		linked_size(const bool width = false, const bool height = false)
 			: widgets(), width(width ? 0 : -1), height(height ? 0 : -1)
 		{
 		}
@@ -646,7 +646,7 @@ private:
 	};
 
 	/** List of the widgets, whose size are linked together. */
-	std::map<std::string, tlinked_size> linked_size_;
+	std::map<std::string, linked_size> linked_size_;
 
 	/**
 	 * Layouts the window.
@@ -798,9 +798,9 @@ struct window_definition : public control_definition
 {
 	explicit window_definition(const config& cfg);
 
-	struct tresolution : public panel_definition::tresolution
+	struct resolution : public panel_definition::resolution
 	{
-		explicit tresolution(const config& cfg);
+		explicit resolution(const config& cfg);
 
 		builder_grid_ptr grid;
 	};
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 95502dea1e2..7444b03b913 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -215,7 +215,7 @@ namespace
 	{
 		t_translation::ter_list old_;
 		t_translation::ter_list new_;
-		terrain_type_data::tmerge_mode mode_;
+		terrain_type_data::merge_mode mode_;
 		boost::optional<t_translation::terrain_code> terrain_;
 		bool use_old_;
 		bool replace_if_failed_;
@@ -295,7 +295,7 @@ void gamemap::overlay(const gamemap& m, const config& rules_cfg, map_location lo
 	if (!rules_cfg["ignore_special_locations"].to_bool(false)) {
 		for(auto& pair : m.starting_positions_.left) {
 			starting_positions_.left.erase(pair.first);
-			starting_positions_.insert(tstarting_positions::value_type(pair.first, t_translation::coordinate(pair.second.x + xpos, pair.second.y + ypos+ ((xpos & 1) && (pair.second.x & 1) ? 1 : 0))));
+			starting_positions_.insert(starting_positions::value_type(pair.first, t_translation::coordinate(pair.second.x + xpos, pair.second.y + ypos+ ((xpos & 1) && (pair.second.x & 1) ? 1 : 0))));
 		}
 	}
 }
@@ -380,7 +380,7 @@ bool gamemap::on_board_with_border(const map_location& loc) const
 	       loc.y >= -border_size() &&  loc.y < h_ + border_size();
 }
 
-void gamemap::set_terrain(const map_location& loc, const t_translation::terrain_code & terrain, const terrain_type_data::tmerge_mode mode, bool replace_if_failed) {
+void gamemap::set_terrain(const map_location& loc, const t_translation::terrain_code & terrain, const terrain_type_data::merge_mode mode, bool replace_if_failed) {
 	if(!on_board_with_border(loc)) {
 		// off the map: ignore request
 		return;
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 2721f977d5e..df52da75db2 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -167,7 +167,7 @@ public:
 	 * Clobbers over the terrain at location 'loc', with the given terrain.
 	 * Uses mode and replace_if_failed like merge_terrains().
 	 */
-	void set_terrain(const map_location& loc, const t_translation::terrain_code & terrain, const terrain_type_data::tmerge_mode mode=terrain_type_data::BOTH, bool replace_if_failed = false);
+	void set_terrain(const map_location& loc, const t_translation::terrain_code & terrain, const terrain_type_data::merge_mode mode=terrain_type_data::BOTH, bool replace_if_failed = false);
 
 	/**
 	 * Maximum number of players supported.
@@ -184,8 +184,8 @@ public:
 	std::vector<map_location> parse_location_range(const std::string& xvals,
 	const std::string &yvals, bool with_border = false) const;
 
-	using tstarting_positions = t_translation::tstarting_positions;
-	const tstarting_positions& special_locations() const { return starting_positions_; }
+	using starting_positions = t_translation::starting_positions;
+	const starting_positions& special_locations() const { return starting_positions_; }
 
 	template<typename F>
 	void for_each_loc(const F& f) const
@@ -210,7 +210,7 @@ public:
 protected:
 	t_translation::ter_map tiles_;
 
-	tstarting_positions starting_positions_;
+	starting_positions starting_positions_;
 
 private:
 
diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp
index f0fe06e0289..502ddf05740 100644
--- a/src/scripting/game_lua_kernel.cpp
+++ b/src/scripting/game_lua_kernel.cpp
@@ -230,9 +230,9 @@ static int special_locations_len(lua_State *L)
 
 static int special_locations_next(lua_State *L)
 {
-	const t_translation::tstarting_positions::left_map& left = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).map().special_locations().left;
+	const t_translation::starting_positions::left_map& left = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).map().special_locations().left;
 
-	t_translation::tstarting_positions::left_const_iterator it;
+	t_translation::starting_positions::left_const_iterator it;
 	if (lua_isnoneornil(L, 2)) {
 		it = left.begin();
 	}
@@ -261,7 +261,7 @@ static int special_locations_pairs(lua_State *L)
 
 static int special_locations_index(lua_State *L)
 {
-	const t_translation::tstarting_positions::left_map& left = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).map().special_locations().left;
+	const t_translation::starting_positions::left_map& left = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).map().special_locations().left;
 	auto it = left.find(luaL_checkstring(L, 2));
 	if (it == left.end()) {
 		return 0;
diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp
index ac6f139a4fb..215186ebdc9 100644
--- a/src/scripting/lua_gui2.cpp
+++ b/src/scripting/lua_gui2.cpp
@@ -617,7 +617,7 @@ namespace { // helpers of intf_set_dialog_callback()
 	}
 
 	/** Helper struct for intf_set_dialog_callback. */
-	struct tdialog_callback_wrapper
+	struct dialog_callback_wrapper
 	{
 		void forward(gui2::widget* widget)
 		{
@@ -651,17 +651,17 @@ int intf_set_dialog_callback(lua_State *L)
 	if (lua_isnil(L, 1)) return 0;
 
 	if (gui2::clickable_item *c = dynamic_cast<gui2::clickable_item *>(w)) {
-		static tdialog_callback_wrapper wrapper;
-		c->connect_click_handler(std::bind(&tdialog_callback_wrapper::forward, wrapper, w));
+		static dialog_callback_wrapper wrapper;
+		c->connect_click_handler(std::bind(&dialog_callback_wrapper::forward, wrapper, w));
 	} else if (gui2::selectable_item *s = dynamic_cast<gui2::selectable_item *>(w)) {
 		s->set_callback_state_change(&dialog_callback);
 	}
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
 	else if (gui2::list_view *l = dynamic_cast<gui2::list_view *>(w)) {
-		static tdialog_callback_wrapper wrapper;
+		static dialog_callback_wrapper wrapper;
 		connect_signal_notify_modified(*l
 				, std::bind(
-					  &tdialog_callback_wrapper::forward
+					  &dialog_callback_wrapper::forward
 					, wrapper
 					, w));
 	}
@@ -760,25 +760,25 @@ int intf_set_dialog_active(lua_State *L)
  */
 int intf_set_dialog_visible(lua_State *L)
 {
-	typedef gui2::control::tvisible tvisible;
+	typedef gui2::control::visibility visibility;
 
-	tvisible flag = tvisible::visible;
+	visibility flag = visibility::visible;
 
 	switch (lua_type(L, 1)) {
 		case LUA_TBOOLEAN:
 			flag = luaW_toboolean(L, 1)
-					? tvisible::visible
-					: tvisible::invisible;
+					? visibility::visible
+					: visibility::invisible;
 			break;
 		case LUA_TSTRING:
 			{
 				const std::string& str = lua_tostring(L, 1);
 				if(str == "visible") {
-					flag = tvisible::visible;
+					flag = visibility::visible;
 				} else if(str == "hidden") {
-					flag = tvisible::hidden;
+					flag = visibility::hidden;
 				} else if(str == "invisible") {
-					flag = tvisible::invisible;
+					flag = visibility::invisible;
 				} else {
 					return luaL_argerror(L, 1, "string must be one of: visible, hidden, invisible");
 				}
@@ -794,7 +794,7 @@ int intf_set_dialog_visible(lua_State *L)
 
 	c->set_visible(flag);
 
-	if(flag == tvisible::hidden) {
+	if(flag == visibility::hidden) {
 		// HACK: this is needed to force the widget to be repainted immediately
 		//       to get rid of its ghost image.
 		scoped_dialog::current->window->invalidate_layout();
diff --git a/src/terrain/translation.cpp b/src/terrain/translation.cpp
index 15f850cfeb8..4858b042b3c 100644
--- a/src/terrain/translation.cpp
+++ b/src/terrain/translation.cpp
@@ -282,7 +282,7 @@ static std::pair<int, int> get_map_size(const char* begin, const char* end)
 	return{ w, h };
 }
 
-ter_map read_game_map(const std::string& str, tstarting_positions& starting_positions, coordinate border_offset)
+ter_map read_game_map(const std::string& str, starting_positions& starting_positions, coordinate border_offset)
 {
 	size_t offset = 0;
 	int x = 0, y = 0, width = 0;
@@ -317,7 +317,7 @@ ter_map read_game_map(const std::string& str, tstarting_positions& starting_posi
 			if (starting_positions.left.find(starting_position) != starting_positions.left.end()) {
 				WRN_G << "Starting position " << starting_position << " is redefined." << std::endl;
 			}
-			starting_positions.insert(tstarting_positions::value_type(starting_position, coordinate(x - border_offset.x, y - border_offset.y)));
+			starting_positions.insert(starting_positions::value_type(starting_position, coordinate(x - border_offset.x, y - border_offset.y)));
 		}
 
 		if(result.w <= x || result.h <= y) {
@@ -380,7 +380,7 @@ ter_map read_game_map(const std::string& str, tstarting_positions& starting_posi
 	return result;
 }
 
-std::string write_game_map(const ter_map& map, const tstarting_positions& starting_positions, coordinate border_offset)
+std::string write_game_map(const ter_map& map, const starting_positions& starting_positions, coordinate border_offset)
 {
 	std::stringstream str;
 
diff --git a/src/terrain/translation.hpp b/src/terrain/translation.hpp
index 63c7e19eb94..eeec337be60 100644
--- a/src/terrain/translation.hpp
+++ b/src/terrain/translation.hpp
@@ -217,7 +217,7 @@ namespace t_translation {
 	 */
 	std::string write_list(const ter_list& list);
 
-	using tstarting_positions = boost::bimaps::bimap<boost::bimaps::set_of<std::string>, boost::bimaps::multiset_of<coordinate>>;
+	using starting_positions = boost::bimaps::bimap<boost::bimaps::set_of<std::string>, boost::bimaps::multiset_of<coordinate>>;
 	/**
 	 * Reads a gamemap string into a 2D vector
 	 *
@@ -250,7 +250,7 @@ namespace t_translation {
 	 * @returns			A 2D vector with the terrains found the vector data is stored
 	 *					like result[x][y] where x the column number is and y the row number.
 	 */
-	ter_map read_game_map(const std::string& str, tstarting_positions& starting_positions, coordinate border_offset = coordinate{ 0, 0 });
+	ter_map read_game_map(const std::string& str, starting_positions& positions, coordinate border_offset = coordinate{ 0, 0 });
 
 	/**
 	 * Write a gamemap in to a vector string.
@@ -262,7 +262,7 @@ namespace t_translation {
 	 *					For readability the map is padded to groups of 12 chars,
 	 *					followed by a comma and space.
 	 */
-	std::string write_game_map(const ter_map& map, const tstarting_positions& starting_positions = tstarting_positions(), coordinate border_offset = coordinate{ 0, 0 });
+	std::string write_game_map(const ter_map& map, const starting_positions& positions = starting_positions(), coordinate border_offset = coordinate{ 0, 0 });
 
 	/**
 	 * Tests whether a specific terrain matches a list of expressions.
diff --git a/src/terrain/type_data.cpp b/src/terrain/type_data.cpp
index 74fa662eebf..cbff344780d 100644
--- a/src/terrain/type_data.cpp
+++ b/src/terrain/type_data.cpp
@@ -174,7 +174,7 @@ bool terrain_type_data::try_merge_terrains(const t_translation::terrain_code & t
 	return true; // Terrain already exists, nothing to do
 }
 
-t_translation::terrain_code terrain_type_data::merge_terrains(const t_translation::terrain_code & old_t, const t_translation::terrain_code & new_t, const tmerge_mode mode, bool replace_if_failed) {
+t_translation::terrain_code terrain_type_data::merge_terrains(const t_translation::terrain_code & old_t, const t_translation::terrain_code & new_t, const merge_mode mode, bool replace_if_failed) {
 	t_translation::terrain_code result = t_translation::NONE_TERRAIN;
 
 	if(mode == OVERLAY) {
diff --git a/src/terrain/type_data.hpp b/src/terrain/type_data.hpp
index 6092ed90744..b10d05b6a4f 100644
--- a/src/terrain/type_data.hpp
+++ b/src/terrain/type_data.hpp
@@ -62,7 +62,7 @@ public:
 	bool is_keep(const t_translation::terrain_code & terrain) const
 		{ return get_terrain_info(terrain).is_keep(); }
 
-	enum tmerge_mode {
+	enum merge_mode {
 		BASE,
 		OVERLAY,
 		BOTH
@@ -76,7 +76,7 @@ public:
 	 * (using the default base if new terrain is an overlay terrain)
 	 * Will return the resulting terrain or NONE_TERRAIN if merging failed
 	 */
-	t_translation::terrain_code merge_terrains(const t_translation::terrain_code & old_t, const t_translation::terrain_code & new_t, const tmerge_mode mode, bool replace_if_failed = false);
+	t_translation::terrain_code merge_terrains(const t_translation::terrain_code & old_t, const t_translation::terrain_code & new_t, const merge_mode mode, bool replace_if_failed = false);
 
 	/**
 	 * Tries to find out if "terrain" can be created by combining two existing
diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp
index 4362ed9c513..c5f28c81884 100644
--- a/src/tests/gui/test_gui2.cpp
+++ b/src/tests/gui/test_gui2.cpp
@@ -120,7 +120,7 @@ namespace gui2 {
 std::vector<std::string>& unit_test_registered_window_list()
 {
 	static std::vector<std::string> result =
-			tunit_test_access_only::get_registered_window_list();
+			unit_test_access_only::get_registered_window_list();
 
 	return result;
 }
@@ -176,13 +176,13 @@ namespace {
 		T* create() { return new T(); }
 	};
 
-	typedef std::pair<unsigned, unsigned> tresolution;
+	typedef std::pair<unsigned, unsigned> resolution;
 	typedef std::vector<std::pair<unsigned, unsigned> > tresolution_list;
 
 	template<class T>
 	void test_resolutions(const tresolution_list& resolutions)
 	{
-		for(const tresolution& resolution : resolutions) {
+		for(const resolution& resolution : resolutions) {
 			CVideo& video = test_utils::get_fake_display(resolution.first, resolution.second).video();
 
 			dialog_tester<T> ctor;
@@ -221,7 +221,7 @@ namespace {
 	{
 		bool interact = false;
 		for(int i = 0; i < 2; ++i) {
-			for(const tresolution& resolution : resolutions) {
+			for(const resolution& resolution : resolutions) {
 				CVideo& video = test_utils::get_fake_display(resolution.first, resolution.second).video();
 
 				dialog_tester<T> ctor;
@@ -268,7 +268,7 @@ namespace {
 	void test_tip_resolutions(const tresolution_list& resolutions
 			, const std::string& id)
 	{
-		for(const tresolution& resolution : resolutions) {
+		for(const resolution& resolution : resolutions) {
 			
 			CVideo& video = test_utils::get_fake_display(resolution.first, resolution.second).video();
 
@@ -766,9 +766,9 @@ struct dialog_tester<gamestate_inspector>
 
 };
 
-struct twesnothd_connection_init
+struct wesnothd_connection_init
 {
-	twesnothd_connection_init(wesnothd_connection& conn)
+	wesnothd_connection_init(wesnothd_connection& conn)
 	{
 		//Swallow the 'cannot connect' execption so that the connection object doesn't throw while we test the dialog.
 		try 
@@ -789,7 +789,7 @@ struct dialog_tester<lobby_main>
 {
 	config game_config;
 	wesnothd_connection connection;
-	twesnothd_connection_init wesnothd_connection_init;
+	wesnothd_connection_init wesnothd_connection_init;
 	std::vector<std::string> installed_addons;
 	lobby_info li;
 	dialog_tester() : connection("", ""), wesnothd_connection_init(connection), li(game_config, installed_addons)
@@ -815,7 +815,7 @@ struct dialog_tester<lobby_player_info>
 	config c;
 	fake_chat_handler ch;
 	wesnothd_connection connection;
-	twesnothd_connection_init wesnothd_connection_init;
+	wesnothd_connection_init wesnothd_connection_init;
 	user_info ui;
 	std::vector<std::string> installed_addons;
 	lobby_info li;
diff --git a/src/tracer.cpp b/src/tracer.cpp
index 715e2a6244e..5b46314114c 100644
--- a/src/tracer.cpp
+++ b/src/tracer.cpp
@@ -17,23 +17,22 @@
 #include <iomanip>
 #include <iostream>
 
-ttracer::tprint::tprint(const ttracer* const tracer__)
-	: tracer(tracer__)
+tracer::printer::printer(const tracer* const t)
+	: tracer_(t)
 {
 }
 
-ttracer::tprint::~tprint()
+tracer::printer::~printer()
 {
-	if(!tracer) {
+	if(!tracer_) {
 		return;
 	}
 
-	std::cerr << "Run statistics for " << tracer->function << ":\n"
-			<< "Runs:\t" << std::dec << tracer->run << "\n";
+	std::cerr << "Run statistics for " << tracer_->function << ":\n"
+			<< "Runs:\t" << std::dec << tracer_->run << "\n";
 
-	typedef std::pair<std::pair<int, std::string>, int> thack;
 	size_t maximum_length = 0;
-	for(const thack& counter : tracer->counters) {
+	for(const auto& counter : tracer_->counters) {
 		maximum_length = std::max(
 				  maximum_length
 				, counter.first.second.length());
@@ -43,7 +42,7 @@ ttracer::tprint::~tprint()
 			  std::ios_base::left
 			, std::ios_base::adjustfield);
 
-	for(const thack& counter : tracer->counters) {
+	for(const auto& counter : tracer_->counters) {
 		std::cerr << "Marker: "
 				<< std::left
 				<< std::setw(maximum_length) << counter.first.second
@@ -55,9 +54,9 @@ ttracer::tprint::~tprint()
 	std::cerr.setf(original_flag, std::ios_base::adjustfield);
 }
 
-ttracer::ttracer(const char* const function__)
+tracer::tracer(const char* const function)
 	: run(0)
-	, function(function__)
+	, function(function)
 	, counters()
 {
 }
diff --git a/src/tracer.hpp b/src/tracer.hpp
index fee82ac43d6..e428dc1b029 100644
--- a/src/tracer.hpp
+++ b/src/tracer.hpp
@@ -26,29 +26,29 @@
 #include <string>
 
 /** Helper structure for gathering the tracing statistics. */
-struct ttracer
+struct tracer
 	: private boost::noncopyable
 {
 	/**
 	 * Helper structure to print the tracing statistics.
 	 *
-	 * When the constructor gets a valid @ref ttracer pointer it prints the
+	 * When the constructor gets a valid @ref tracer pointer it prints the
 	 * tracing statistics in its destructor. This allows the structure to be
 	 * initialised at the beginning of a scope and print the statistics once
 	 * the scope is left. (This makes it easier to write the tracing macros.)
 	 */
-	struct tprint
+	struct printer
 		: private boost::noncopyable
 	{
-		explicit tprint(const ttracer* const tracer__);
+		explicit printer(const tracer* const tracer__);
 
-		~tprint();
+		~printer();
 
 		/** The tracer, whose statistics to print. */
-		const ttracer* const tracer;
+		const tracer* const tracer_;
 	};
 
-	explicit ttracer(const char* const function__);
+	explicit tracer(const char* const function__);
 
 	/** The total number of runs. */
 	int run;
@@ -81,12 +81,12 @@ struct ttracer
  */
 #ifdef __GNUC__
 #define TRACER_ENTRY(interval)                                               \
-	static ttracer tracer(__PRETTY_FUNCTION__);                              \
-	ttracer::tprint print((++tracer.run % interval) == 0 ? &tracer : nullptr)
+	static struct tracer tracer(__PRETTY_FUNCTION__);                              \
+	tracer::printer print((++tracer.run % interval) == 0 ? &tracer : nullptr)
 #else
 #define TRACER_ENTRY(interval)                                               \
-	static ttracer tracer(__FUNCTION__);                                     \
-	ttracer::tprint print((++tracer.run % interval) == 0 ? &tracer : nullptr)
+	static struct tracer tracer(__FUNCTION__);                                     \
+	tracer::printer print((++tracer.run % interval) == 0 ? &tracer : nullptr)
 #endif
 
 /**
diff --git a/src/wesmage/exit.cpp b/src/wesmage/exit.cpp
index 2f96b57c5c9..aa0a89abb7e 100644
--- a/src/wesmage/exit.cpp
+++ b/src/wesmage/exit.cpp
@@ -14,7 +14,7 @@
 
 #include "wesmage/exit.hpp"
 
-texit::texit(const int status__)
+exiter::exiter(const int status__)
 	: status(status__)
 {
 }
diff --git a/src/wesmage/exit.hpp b/src/wesmage/exit.hpp
index adcd4f5d416..70557652bb4 100644
--- a/src/wesmage/exit.hpp
+++ b/src/wesmage/exit.hpp
@@ -23,12 +23,12 @@
 /**
  * This exception when throw should terminate the application.
  *
- * The application should terminate with @ref texit::status as its exit
+ * The application should terminate with @ref exiter::status as its exit
  * status.
  */
-struct texit
+struct exiter
 {
-	texit(const int status__);
+	exiter(const int status__);
 
 	/** The exit status for the application. */
 	int status;
diff --git a/src/wesmage/filter.cpp b/src/wesmage/filter.cpp
index 1a684d26adf..e8cbe299cc3 100644
--- a/src/wesmage/filter.cpp
+++ b/src/wesmage/filter.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 
 /** Contains the definition of a filter. */
-struct tfilter
+struct filter
 {
 	/**
 	 * The functor to call for the filter.
@@ -39,7 +39,7 @@ struct tfilter
 			)>
 			functor_t;
 
-	tfilter(
+	filter(
 			  const std::string& name__
 			, const std::string& description__
 			, const functor_t& functor__)
@@ -61,7 +61,7 @@ struct tfilter
 	 *
 	 * The exact format of the string is documented at @ref filter_list.
 	 */
-	tfilter_description description;
+	filter_description description;
 
 	/** The functor to call for the filter. */
 	functor_t functor;
@@ -74,12 +74,12 @@ struct tfilter
  * * @p first                     The name of the filter.
  * * @p second                    The filter itself.
  */
-static std::map<std::string, tfilter> filters;
+static std::map<std::string, filter> filters;
 
 /** Helper structure to register a filter to the @ref filters. */
-struct tregister_filter
+struct register_filter
 {
-	tregister_filter(const std::pair<std::string, tfilter>& filter)
+	register_filter(const std::pair<std::string, filter>& filter)
 	{
 		filters.insert(filter);
 	}
@@ -95,12 +95,12 @@ struct tregister_filter
  *                                pipe-symbol. When the list is splitted in
  *                                to a vector of string its contents should
  *                                be compatible with the constructor of
- *                                @ref tfilter_description.
+ *                                @ref filter_description.
  */
 #define REGISTER(name, description)                                           \
-	tregister_filter register_filter_##name(std::make_pair(                   \
+	register_filter register_filter_##name(std::make_pair(                   \
 			  #name                                                           \
-			, tfilter(#name, #name description, std::bind(name, _1, _2))));
+			, filter(#name, #name description, std::bind(name, _1, _2))));
 
 static void
 scale(surface& surf, const std::string& parameters)
@@ -112,7 +112,7 @@ scale(surface& surf, const std::string& parameters)
 		std::cerr << "Error: Arguments to scale »"
 				<< parameters
 				<< "« are not compatible.\n";
-		throw texit(EXIT_FAILURE);
+		throw exiter(EXIT_FAILURE);
 	}
 
 	surf = scale_surface(surf, width, height);
@@ -137,7 +137,7 @@ brighten(surface& surf, const std::string& parameters)
 				<< parameters
 				<< "« are not compatible.\n";
 
-		throw texit(EXIT_FAILURE);
+		throw exiter(EXIT_FAILURE);
 	}
 
 	surf = brighten_image(surf, amount);
@@ -162,7 +162,7 @@ blend(surface& surf, const std::string& parameters)
 				<< parameters
 				<< "« are not compatible.\n";
 
-		throw texit(EXIT_FAILURE);
+		throw exiter(EXIT_FAILURE);
 	}
 
 	surf = blend_surface(surf, amount, color);
@@ -193,20 +193,20 @@ filter_apply(surface& surf, const std::string& filter)
 				<< filter
 				<< "« doesn't contain the expected separator »:«\n";
 
-		throw texit(EXIT_FAILURE);
+		throw exiter(EXIT_FAILURE);
 	}
 
-	std::map<std::string, tfilter>::iterator itor = filters.find(f[0]);
+	std::map<std::string, filter>::iterator itor = filters.find(f[0]);
 
 	if(itor == filters.end()) {
 		std::cerr << "Error: Filter »" << f[0] << "« is unknown.\n";
-		throw texit(EXIT_FAILURE);
+		throw exiter(EXIT_FAILURE);
 	}
 
 	itor->second.functor(surf, f[1]);
 }
 
-tfilter_description::tfilter_description(const std::string& fmt)
+filter_description::filter_description(const std::string& fmt)
 	: name()
 	, description()
 	, parameters()
@@ -224,7 +224,7 @@ tfilter_description::tfilter_description(const std::string& fmt)
 
 	for(size_t i = 2; i < elements.size(); i += 3) {
 
-		tfilter_description::tparameter parameter =
+		filter_description::parameter parameter =
 		{
 			  elements[i]
 			, elements[i + 1]
@@ -235,12 +235,11 @@ tfilter_description::tfilter_description(const std::string& fmt)
 	}
 }
 
-std::vector<tfilter_description>
+std::vector<filter_description>
 filter_list()
 {
-	std::vector<tfilter_description> result;
-	typedef std::pair<std::string, tfilter> thack;
-	for(const thack& filter : filters) {
+	std::vector<filter_description> result;
+	for(const auto& filter : filters) {
 		result.push_back(filter.second.description);
 	}
 	return result;
diff --git a/src/wesmage/filter.hpp b/src/wesmage/filter.hpp
index ccf28bf18e0..e62b0a3fd04 100644
--- a/src/wesmage/filter.hpp
+++ b/src/wesmage/filter.hpp
@@ -33,7 +33,7 @@ filter_apply(surface& surf, const std::string& filter);
  *
  * This structure should make it easier to create help messages.
  */
-struct tfilter_description
+struct filter_description
 {
 	/**
 	 * Constructor.
@@ -42,17 +42,17 @@ struct tfilter_description
 	 * contains of a number of fields seperated by a pipe-symbol. The number
 	 * of fields should be 2 + 3 * params, where params is the number of
 	 * parameters of the filter. The fields are:
-	 * * 1 The @ref tfilter_description::name
-	 * * 2 The @ref tfilter_description::description
+	 * * 1 The @ref filter_description::name
+	 * * 2 The @ref filter_description::description
 	 * After these two fields there are three fields per parameter, the
 	 * fields are:
-	 * * 1 The @ref tfilter_description::tparameter::name
-	 * * 2 The @ref tfilter_description::tparameter::type
-	 * * 3 The @ref tfilter_description::tparameter::description
+	 * * 1 The @ref filter_description::parameter::name
+	 * * 2 The @ref filter_description::parameter::type
+	 * * 3 The @ref filter_description::parameter::description
 	 *
 	 * @param fmt                 The format string as described above.
 	 */
-	explicit tfilter_description(const std::string& fmt);
+	explicit filter_description(const std::string& fmt);
 
 	/**
 	 * Name of the filter.
@@ -69,7 +69,7 @@ struct tfilter_description
 	std::string description;
 
 	/** Describes a filter parameter. */
-	struct tparameter
+	struct parameter
 	{
 		/** The name of the parameter. */
 		std::string name;
@@ -82,11 +82,11 @@ struct tfilter_description
 	};
 
 	/** The list of filter parameters. */
-	std::vector<tparameter> parameters;
+	std::vector<parameter> parameters;
 };
 
 /** Returns the list of available filters. */
-std::vector<tfilter_description>
+std::vector<filter_description>
 filter_list();
 
 #endif
diff --git a/src/wesmage/options.cpp b/src/wesmage/options.cpp
index d89b9d8efa1..03d30f6a63e 100644
--- a/src/wesmage/options.cpp
+++ b/src/wesmage/options.cpp
@@ -22,7 +22,7 @@
 #include <ctime>
 #include <iostream>
 
-toptions::toptions()
+cmdline_options::cmdline_options()
 	: input_filename()
 	, output_filename()
 	, filters()
@@ -91,10 +91,10 @@ print_option(
 static std::ostream&
 operator<<(
 		  std::ostream& stream
-		, const tfilter_description& fd)
+		, const filter_description& fd)
 {
 	print_option(stream, fd.name, fd.description);
-	for(const tfilter_description::tparameter& p : fd.parameters) {
+	for(const filter_description::parameter& p : fd.parameters) {
 		print_option(
 				  stream
 				, " * " + p.name + " (" + p.type + ")"
@@ -135,11 +135,11 @@ print_help(const int exit_status)
 "\n"
 "The following filters are currently implemented:\n"
 ;
-	for(const tfilter_description& filter : filter_list()) {
+	for(const filter_description& filter : filter_list()) {
 		std::cout << filter;
 	}
 
-	throw texit(exit_status);
+	throw exiter(exit_status);
 }
 
 #define VALIDATE_NOT_PAST_END                                                 \
@@ -149,14 +149,14 @@ print_help(const int exit_status)
 					<< option                                                 \
 					<< "« is not supplied.\n";                                \
                                                                               \
-			throw texit(EXIT_FAILURE);                                        \
+			throw exiter(EXIT_FAILURE);                                        \
 		}                                                                     \
 	} while(0)
 
-const toptions&
-toptions::parse(int argc, char* argv[])
+const cmdline_options&
+cmdline_options::parse(int argc, char* argv[])
 {
-	toptions& result = singleton(false);
+	cmdline_options& result = singleton(false);
 
 	bool help = false;
 	bool dry_run = false;
@@ -251,19 +251,19 @@ toptions::parse(int argc, char* argv[])
 	return result;
 }
 
-const toptions&
-toptions::options()
+const cmdline_options&
+cmdline_options::options()
 {
 	return singleton(true);
 }
 
-toptions&
-toptions::singleton(const bool is_initialized)
+cmdline_options&
+cmdline_options::singleton(const bool is_initialized)
 {
 	static bool initialized = false;
 	assert(is_initialized == initialized);
 	initialized = true;
 
-	static toptions result;
+	static cmdline_options result;
 	return result;
 }
diff --git a/src/wesmage/options.hpp b/src/wesmage/options.hpp
index f5df556b41e..ee08a9e6b61 100644
--- a/src/wesmage/options.hpp
+++ b/src/wesmage/options.hpp
@@ -26,12 +26,12 @@
 #include <vector>
 
 /** A singleton class containing the parsed command line parameters. */
-struct toptions
+struct cmdline_options
 	: private boost::noncopyable
 {
 private:
 
-	toptions();
+	cmdline_options();
 
 public:
 
@@ -45,18 +45,18 @@ public:
 	 *
 	 * @returns                   The parsed options.
 	 */
-	static const toptions&
+	static const cmdline_options&
 	parse(int argc, char* argv[]);
 
 	/**
 	 * Returns the cached parsed command line parameters.
 	 *
-	 * This function shall only be called after @ref toptions::parse has
+	 * This function shall only be called after @ref cmdline_options::parse has
 	 * been called.
 	 *
 	 * @returns                   The parsed options.
 	 */
-	static const toptions&
+	static const cmdline_options&
 	options();
 
 	/** The filename of the input file. */
@@ -84,13 +84,13 @@ private:
 	 * Helper which contains the single instance of this class.
 	 *
 	 * @param is_initialized      Helper variable to track whether
-	 *                            @ref toptions::parse is only called once
-	 *                            and whether @ref toptions::options isn't
-	 *                            called before @ref toptions::parse.
+	 *                            @ref cmdline_options::parse is only called once
+	 *                            and whether @ref options::options isn't
+	 *                            called before @ref options::parse.
 	 *
 	 * @returns                   The single instance of this class.
 	 */
-	static toptions&
+	static cmdline_options&
 	singleton(const bool is_initialized);
 };
 
diff --git a/src/wesmage/wesmage.cpp b/src/wesmage/wesmage.cpp
index f718bee5e7f..95d1e5b7b87 100644
--- a/src/wesmage/wesmage.cpp
+++ b/src/wesmage/wesmage.cpp
@@ -56,7 +56,7 @@ int
 main(int argc, char* argv[])
 {
 	try {
-		const toptions& options = toptions::parse(argc, argv);
+		const cmdline_options& options = cmdline_options::parse(argc, argv);
 
 		surface surf(make_neutral_surface(
 				IMG_Load(options.input_filename.c_str())));
@@ -99,7 +99,7 @@ main(int argc, char* argv[])
 			save_image(surfaces[0], options.output_filename);
 		}
 
-	} catch(const texit& exit) {
+	} catch(const exiter& exit) {
 		return exit.status;
 	} catch(exploder_failure& err) {
 		std::cerr << "Error: Failed with error »" << err.message << "«.\n";