Merge lp:~widelands-dev/widelands/bug-1343297_2 into lp:widelands

[GunChleoc]

Converted remaining enums, classes and structs to CamelCase, and a bunch od typedefs.

The codecheck rule has a NOCOM comment in it, because I'm not sure what we want to do with the remaining typedefs.

I would also like to see classes like FCoords and TCoords renamed, because I have no idea what F and T mean here.

[SirVer (sirver)]

small nits.

review: Approve

[GunChleoc (gunchleoc)]

2 questions then:

what does the _t in TypeAndLevel_t mean? We also have some _s stuff in the typedefs.

I also have trouble with a rule for everything - a simple check for underscore won't do, because of the uint16_t in definitions like std::pair<uint16_t, uint16_t>. Also, some typedefs are multiline with brackets.

If we wish to move to 'using' anyway, maybe just skip the rule and clean them up?

[SirVer (sirver)]

> what does the _t in TypeAndLevel_t mean? We also have some _s stuff in the typedefs.

The _t mymics standard naming conventions from C++: uint8_t (_t stands for type). I think it unwise to use this for user defined types as for me it symbolizes a standard type. _s I have no idea what it should stand for and I think we should use it.

> If we wish to move to 'using' anyway, maybe just skip the rule and clean them up?

Just add a simple rule that check that typedef is never used then?

[GunChleoc (gunchleoc)]

Sounds good to me: I'll switch everything to "using", which will make for an easier code check rule afterwards

[GunChleoc (gunchleoc)]

All done.

Codecheck still coughs up 2 tyxpedefs in src/network/network_system.h, but I don't know what to do about those.

review: Needs Resubmitting

[SirVer (sirver)]

Convert those to using too, but keep the names (that is a compatibility fix for windows).

[SirVer (sirver)]

review: Needs Fixing

[GunChleoc (gunchleoc)]

Done. I also added an exception to the CamelCase codecheck rule to avoid the false positives.

[SirVer (sirver)]

One nit. Please fix and merge.

review: Approve

=== added file 'cmake/codecheck/rules/camel_case_for_classes'
--- cmake/codecheck/rules/camel_case_for_classes	1970-01-01 00:00:00 +0000
+++ cmake/codecheck/rules/camel_case_for_classes	2014-09-18 15:54:00 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+
+import re
+
+strip_comments_and_strings = True
+
+def evaluate_matches(lines, fn):
+   errors = []
+
+   for lineno, line in enumerate(lines):
+
+      # Exception for Microsoft fix in src/network/network_system.h
+      if line.count("in_port_t = uint16_t") or line.count("in_addr_t = uint32_t"):
+         continue
+
+      if re.match("(^\s*((class|struct)\s+((\S+_)|([a-z]\S+)).*{)|((enum)\s+((\S+_)|(([abd-z])|(c(?!lass))\S+)).*{)|((using)\s+((\S+_)|([a-z]\S+)).*=).*$)", line):
+
+         errors.append((fn, lineno+1, "Use CapitalLetterWithCamelCase when naming an enum class, struct, or \"using\"."))
+
+   return errors
+# /end evaluate_matches
+
+forbidden = [
+    "class my_class",
+    "class myClass",
+    "struct my_struct",
+    "struct myStruct",
+    "using my_typedef",
+    "using myTypedef",
+    "enum class my_enum",
+    "enum class myEnum"
+    "enum my_enum",
+    "enum myEnum"
+]
+
+allowed = [
+    "class MyClass",
+    "struct MyStruct",
+    "using MyTypedef",
+    "enum class MyEnum",
+    "enum MyEnum"
+]

=== added file 'cmake/codecheck/rules/do_not_use_typedef'
--- cmake/codecheck/rules/do_not_use_typedef	1970-01-01 00:00:00 +0000
+++ cmake/codecheck/rules/do_not_use_typedef	2014-09-18 15:54:00 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import re
+
+strip_comments_and_strings = True
+
+def evaluate_matches(lines, fn):
+   errors = []
+
+   for lineno, line in enumerate(lines):
+
+      if line.count("typedef"):
+         errors.append((fn, lineno+1, "Do not use \"typedef\". Use \"using\" instead."))
+
+   return errors
+# /end evaluate_matches
+
+forbidden = [
+    "typedef uint8_t MyType"
+]
+
+allowed = [
+    "using MyType = uint8_t"
+]

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2014-07-28 16:59:54 +0000
+++ src/ai/ai_help_structs.h	2014-09-18 15:54:00 +0000
@@ -283,7 +283,7 @@
 
 struct BuildingObserver {
 	char const* name;
-	Widelands::Building_Index id;
+	Widelands::BuildingIndex id;
 	Widelands::BuildingDescr const* desc;
 
 	enum {

=== modified file 'src/ai/computer_player.cc'
--- src/ai/computer_player.cc	2014-07-23 20:12:17 +0000
+++ src/ai/computer_player.cc	2014-09-18 15:54:00 +0000
@@ -21,24 +21,24 @@
 
 #include "ai/defaultai.h"
 
-Computer_Player::Computer_Player
-	(Widelands::Game & g, Widelands::Player_Number const pid)
+ComputerPlayer::ComputerPlayer
+	(Widelands::Game & g, Widelands::PlayerNumber const pid)
 	: m_game(g), m_player_number(pid)
 {
 }
 
-Computer_Player::~Computer_Player() {}
+ComputerPlayer::~ComputerPlayer() {}
 
-struct EmptyAI : Computer_Player {
-	EmptyAI(Widelands::Game & g, const Widelands::Player_Number pid)
-	: Computer_Player(g, pid) {}
+struct EmptyAI : ComputerPlayer {
+	EmptyAI(Widelands::Game & g, const Widelands::PlayerNumber pid)
+	: ComputerPlayer(g, pid) {}
 
 	void think() override {}
 
 	struct EmptyAIImpl : Implementation {
 		EmptyAIImpl() {name = _("None");}
-		Computer_Player * instantiate
-			(Widelands::Game & g, Widelands::Player_Number const pid) const override
+		ComputerPlayer * instantiate
+			(Widelands::Game & g, Widelands::PlayerNumber const pid) const override
 		{
 			return new EmptyAI(g, pid);
 		}
@@ -49,10 +49,10 @@
 
 EmptyAI::EmptyAIImpl EmptyAI::implementation;
 
-const Computer_Player::ImplementationVector &
-Computer_Player::getImplementations()
+const ComputerPlayer::ImplementationVector &
+ComputerPlayer::getImplementations()
 {
-	static std::vector<Computer_Player::Implementation const *> impls;
+	static std::vector<ComputerPlayer::Implementation const *> impls;
 
 	if (impls.empty()) {
 		impls.push_back(&DefaultAI::aggressiveImpl);
@@ -64,12 +64,12 @@
 	return impls;
 }
 
-const Computer_Player::Implementation * Computer_Player::getImplementation
+const ComputerPlayer::Implementation * ComputerPlayer::getImplementation
 	(const std::string & name)
 {
 	const ImplementationVector & vec = getImplementations();
 
-	for (const Computer_Player::Implementation* implementation : vec) {
+	for (const ComputerPlayer::Implementation* implementation : vec) {
 		if (implementation->name == name) {
 			return implementation;
 		}

=== modified file 'src/ai/computer_player.h'
--- src/ai/computer_player.h	2014-07-16 08:23:42 +0000
+++ src/ai/computer_player.h	2014-09-18 15:54:00 +0000
@@ -36,14 +36,14 @@
  * Instances of actual AI implementation can be created via the
  * \ref Implementation interface.
  */
-struct Computer_Player {
-	Computer_Player(Widelands::Game &, const Widelands::Player_Number);
-	virtual ~Computer_Player();
+struct ComputerPlayer {
+	ComputerPlayer(Widelands::Game &, const Widelands::PlayerNumber);
+	virtual ~ComputerPlayer();
 
 	virtual void think () = 0;
 
 	Widelands::Game & game() const {return m_game;}
-	Widelands::Player_Number player_number() {return m_player_number;}
+	Widelands::PlayerNumber player_number() {return m_player_number;}
 
 	/**
 	 * Interface to a concrete implementation, used to instantiate AIs.
@@ -53,12 +53,10 @@
 	struct Implementation {
 		std::string name;
 		virtual ~Implementation() {}
-		virtual Computer_Player * instantiate
-			(Widelands::Game &, Widelands::Player_Number) const = 0;
+		virtual ComputerPlayer * instantiate
+			(Widelands::Game &, Widelands::PlayerNumber) const = 0;
 	};
-	typedef
-		std::vector<Computer_Player::Implementation const *>
-		ImplementationVector;
+	using ImplementationVector = std::vector<ComputerPlayer::Implementation const *>;
 
 	/**
 	 * Get a list of available AI implementations.
@@ -72,9 +70,9 @@
 
 private:
 	Widelands::Game & m_game;
-	Widelands::Player_Number const m_player_number;
+	Widelands::PlayerNumber const m_player_number;
 
-	DISALLOW_COPY_AND_ASSIGN(Computer_Player);
+	DISALLOW_COPY_AND_ASSIGN(ComputerPlayer);
 };
 
 #endif  // end of include guard: WL_AI_COMPUTER_PLAYER_H

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-08-26 19:40:13 +0000
+++ src/ai/defaultai.cc	2014-09-18 15:54:00 +0000
@@ -62,8 +62,8 @@
 DefaultAI::DefensiveImpl DefaultAI::defensiveImpl;
 
 /// Constructor of DefaultAI
-DefaultAI::DefaultAI(Game& ggame, Player_Number const pid, uint8_t const t)
-   : Computer_Player(ggame, pid),
+DefaultAI::DefaultAI(Game& ggame, PlayerNumber const pid, uint8_t const t)
+   : ComputerPlayer(ggame, pid),
      type_(t),
      m_buildable_changed(true),
      m_mineable_changed(true),
@@ -232,20 +232,20 @@
 	player_ = game().get_player(player_number());
 	tribe_ = &player_->tribe();
 	log("ComputerPlayer(%d): initializing (%u)\n", player_number(), type_);
-	Ware_Index const nr_wares = tribe_->get_nrwares();
+	WareIndex const nr_wares = tribe_->get_nrwares();
 	wares.resize(nr_wares);
 
-	for (Ware_Index i = 0; i < nr_wares; ++i) {
+	for (WareIndex i = 0; i < nr_wares; ++i) {
 		wares.at(i).producers_ = 0;
 		wares.at(i).consumers_ = 0;
 		wares.at(i).preciousness_ = tribe_->get_ware_descr(i)->preciousness();
 	}
 
 	// collect information about the different buildings our tribe can construct
-	Building_Index const nr_buildings = tribe_->get_nrbuildings();
+	BuildingIndex const nr_buildings = tribe_->get_nrbuildings();
 	const World& world = game().world();
 
-	for (Building_Index i = 0; i < nr_buildings; ++i) {
+	for (BuildingIndex i = 0; i < nr_buildings; ++i) {
 		const BuildingDescr& bld = *tribe_->get_building_descr(i);
 		const std::string& building_name = bld.name();
 		const BuildingHints& bh = bld.hints();
@@ -299,7 +299,7 @@
 			for (const WareAmount& temp_input : prod.inputs()) {
 				bo.inputs_.push_back(temp_input.first);
 			}
-			for (const Ware_Index& temp_output : prod.output_ware_types()) {
+			for (const WareIndex& temp_output : prod.output_ware_types()) {
 				bo.outputs_.push_back(temp_output);
 			}
 
@@ -354,8 +354,8 @@
 	Map& map = game().map();
 	std::set<OPtr<PlayerImmovable>> found_immovables;
 
-	for (Y_Coordinate y = 0; y < map.get_height(); ++y) {
-		for (X_Coordinate x = 0; x < map.get_width(); ++x) {
+	for (int16_t y = 0; y < map.get_height(); ++y) {
+		for (int16_t x = 0; x < map.get_width(); ++x) {
 			FCoords f = map.get_fcoords(Coords(x, y));
 
 			if (f.field->get_owned_by() != player_number())
@@ -483,7 +483,7 @@
 	Map& map = game().map();
 	FindNodeUnowned find_unowned(player_, game());
 	FindNodeUnownedMineable find_unowned_mines_pots(player_, game());
-	Player_Number const pn = player_->player_number();
+	PlayerNumber const pn = player_->player_number();
 	const World& world = game().world();
 	field.unowned_land_nearby_ =
 	   map.find_fields(Area<FCoords>(field.coords, range), nullptr, find_unowned);
@@ -841,7 +841,7 @@
 		military_boost = 200;
 	}
 
-	// Building_Index proposed_building = INVALID_INDEX; // I need BuildingObserver not index
+	// BuildingIndex proposed_building = INVALID_INDEX; // I need BuildingObserver not index
 	BuildingObserver* best_building = nullptr;
 	int32_t proposed_priority = 0;
 	Coords proposed_coords;
@@ -925,7 +925,7 @@
 						continue;
 
 					for (uint32_t m = 0; m < bo.outputs_.size(); ++m) {
-						Ware_Index wt(static_cast<size_t>(bo.outputs_.at(m)));
+						WareIndex wt(static_cast<size_t>(bo.outputs_.at(m)));
 
 						if (observer->economy.needs_ware(wt)) {
 							output_is_needed = true;
@@ -1557,7 +1557,7 @@
 			const Map& map = game().map();
 			CoordPath cp(map, path);
 			// try to split after two steps
-			CoordPath::Step_Vector::size_type i = cp.get_nsteps() - 1, j = 1;
+			CoordPath::StepVector::size_type i = cp.get_nsteps() - 1, j = 1;
 
 			for (; i >= j; --i, ++j) {
 				{
@@ -1813,8 +1813,8 @@
 	}
 
 	// Get max radius of recursive workarea
-	Workarea_Info::size_type radius = 0;
-	const Workarea_Info& workarea_info = site.bo->desc->m_workarea_info;
+	WorkareaInfo::size_type radius = 0;
+	const WorkareaInfo& workarea_info = site.bo->desc->m_workarea_info;
 	for (const std::pair<uint32_t, std::set<std::string> > & temp_info : workarea_info) {
 		if (radius < temp_info.first) {
 			radius = temp_info.first;
@@ -2012,8 +2012,8 @@
 
 	// Check whether building is enhanceable and if wares of the enhanced
 	// buildings are needed. If yes consider an upgrade.
-	const Building_Index enhancement = site.site->descr().enhancement();
-	Building_Index enbld = INVALID_INDEX;  // to get rid of this
+	const BuildingIndex enhancement = site.site->descr().enhancement();
+	BuildingIndex enbld = INVALID_INDEX;  // to get rid of this
 	BuildingObserver* bestbld = nullptr;
 
 	// Only enhance buildings that are allowed (scenario mode)
@@ -2118,8 +2118,8 @@
 	}
 
 	// Check whether building is enhanceable. If yes consider an upgrade.
-	const Building_Index enhancement = site.site->descr().enhancement();
-	Building_Index enbld = INVALID_INDEX;
+	const BuildingIndex enhancement = site.site->descr().enhancement();
+	BuildingIndex enbld = INVALID_INDEX;
 	BuildingObserver* bestbld = nullptr;
 	bool changed = false;
 	// Only enhance buildings that are allowed (scenario mode)
@@ -2163,7 +2163,7 @@
 // this count ware as hints
 uint32_t DefaultAI::get_stocklevel_by_hint(size_t hintoutput) {
 	uint32_t count = 0;
-	Ware_Index wt(hintoutput);
+	WareIndex wt(hintoutput);
 	for (EconomyObserver* observer : economies) {
 		// Don't check if the economy has no warehouse.
 		if (observer->economy.warehouses().empty())
@@ -2186,7 +2186,7 @@
 				continue;
 
 			for (uint32_t m = 0; m < bo.outputs_.size(); ++m) {
-				Ware_Index wt(static_cast<size_t>(bo.outputs_.at(m)));
+				WareIndex wt(static_cast<size_t>(bo.outputs_.at(m)));
 				count += observer->economy.stock_ware(wt);
 			}
 		}
@@ -2603,7 +2603,7 @@
 	// counting players in game
 	uint32_t plr_in_game = 0;
 	std::vector<bool> player_attackable;
-	Player_Number const nr_players = game().map().get_nrplayers();
+	PlayerNumber const nr_players = game().map().get_nrplayers();
 	player_attackable.resize(nr_players);
 	bool any_attackable = false;
 	bool any_attacked = false;
@@ -2619,7 +2619,7 @@
 	iterate_players_existing_novar(p, nr_players, game())++ plr_in_game;
 
 	// receiving games statistics and parsing it (reading latest entry)
-	const Game::General_Stats_vector& genstats = game().get_general_statistics();
+	const Game::GeneralStatsVector& genstats = game().get_general_statistics();
 	for (uint8_t j = 1; j <= plr_in_game; ++j) {
 		if (pn == j) {
 			player_attackable[j - 1] = false;

=== modified file 'src/ai/defaultai.h'
--- src/ai/defaultai.h	2014-07-26 10:43:23 +0000
+++ src/ai/defaultai.h	2014-09-18 15:54:00 +0000
@@ -65,8 +65,8 @@
 // - handling of trainingsites (if supply line is broken - send some soldiers
 //   out, to have some more forces. Reincrease the number of soldiers that
 //   should be trained if inputs_ get filled again.).
-struct DefaultAI : Computer_Player {
-	DefaultAI(Widelands::Game&, const Widelands::Player_Number, uint8_t);
+struct DefaultAI : ComputerPlayer {
+	DefaultAI(Widelands::Game&, const Widelands::PlayerNumber, uint8_t);
 	~DefaultAI();
 	void think() override;
 
@@ -77,32 +77,32 @@
 	};
 
 	/// Implementation for Aggressive
-	struct AggressiveImpl : public Computer_Player::Implementation {
+	struct AggressiveImpl : public ComputerPlayer::Implementation {
 		AggressiveImpl() {
 			name = _("Aggressive");
 		}
-		Computer_Player* instantiate(Widelands::Game& game,
-		                             Widelands::Player_Number const p) const override {
+		ComputerPlayer* instantiate(Widelands::Game& game,
+		                             Widelands::PlayerNumber const p) const override {
 			return new DefaultAI(game, p, AGGRESSIVE);
 		}
 	};
 
-	struct NormalImpl : public Computer_Player::Implementation {
+	struct NormalImpl : public ComputerPlayer::Implementation {
 		NormalImpl() {
 			name = _("Normal");
 		}
-		Computer_Player* instantiate(Widelands::Game& game,
-		                             Widelands::Player_Number const p) const override {
+		ComputerPlayer* instantiate(Widelands::Game& game,
+		                             Widelands::PlayerNumber const p) const override {
 			return new DefaultAI(game, p, NORMAL);
 		}
 	};
 
-	struct DefensiveImpl : public Computer_Player::Implementation {
+	struct DefensiveImpl : public ComputerPlayer::Implementation {
 		DefensiveImpl() {
 			name = _("Defensive");
 		}
-		Computer_Player* instantiate(Widelands::Game& game,
-		                             Widelands::Player_Number const p) const override {
+		ComputerPlayer* instantiate(Widelands::Game& game,
+		                             Widelands::PlayerNumber const p) const override {
 			return new DefaultAI(game, p, DEFENSIVE);
 		}
 	};
@@ -165,7 +165,7 @@
 	bool m_mineable_changed;
 
 	Widelands::Player* player_;
-	Widelands::Tribe_Descr const* tribe_;
+	Widelands::TribeDescr const* tribe_;
 
 	std::vector<BuildingObserver> buildings_;
 	uint32_t num_constructionsites_;

=== modified file 'src/base/exceptions.cc'
--- src/base/exceptions.cc	2014-06-23 20:17:05 +0000
+++ src/base/exceptions.cc	2014-09-18 15:54:00 +0000
@@ -25,10 +25,10 @@
 #include <sstream>
 
 /*
- * class _wexception implementation
+ * class WException implementation
  */
 #undef wexception
-_wexception::_wexception
+WException::WException
 	(char const * const file, uint32_t const line, char const * const fmt, ...)
 {
 	char buffer[512];
@@ -43,7 +43,7 @@
 	m_what = ost.str();
 }
 
-char const * _wexception::what() const noexcept {
+char const * WException::what() const noexcept {
 	return m_what.c_str();
 }
 
@@ -51,7 +51,7 @@
 /*
  * class warning implementation
  */
-warning::warning(char const * const et, char const * const em, ...) :
+WLWarning::WLWarning(char const * const et, char const * const em, ...) :
 	m_title(et)
 {
 	char buffer[512];
@@ -64,11 +64,11 @@
 	m_what = buffer;
 }
 
-char const * warning::title() const
+char const * WLWarning::title() const
 {
 	return m_title.c_str();
 }
 
-char const * warning::what() const noexcept {
+char const * WLWarning::what() const noexcept {
 	return m_what.c_str();
 }

=== modified file 'src/base/md5.cc'
--- src/base/md5.cc	2014-07-03 19:26:30 +0000
+++ src/base/md5.cc	2014-09-18 15:54:00 +0000
@@ -32,7 +32,7 @@
 /**
  * Create a hex string out of the MD5 checksum.
  */
-string md5_checksum::str() const
+string Md5Checksum::str() const
 {
 	string s;
 
@@ -60,7 +60,7 @@
 
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
-void * md5_finish_ctx (md5_ctx * const ctx, void * const resbuf)
+void * md5_finish_ctx (Md5Ctx * const ctx, void * const resbuf)
 {
 	/* Take yet unprocessed bytes into account.  */
 	uint32_t bytes = ctx->buflen;
@@ -95,7 +95,7 @@
 
 /* Processes some bytes in the internal buffer */
 void md5_process_bytes
-	(void const * buffer, uint32_t len, struct md5_ctx * const ctx)
+	(void const * buffer, uint32_t len, struct Md5Ctx * const ctx)
 {
 	/* When we already have some bits in our internal buffer concatenate
 		both inputs first.  */
@@ -151,7 +151,7 @@
    It is assumed that LEN % 64 == 0.  */
 
 void md5_process_block
-	(void const * const buffer, uint32_t const len, md5_ctx * const ctx)
+	(void const * const buffer, uint32_t const len, Md5Ctx * const ctx)
 {
 	uint32_t correct_words[16];
 	uint32_t const *       words  = static_cast<uint32_t const *>(buffer);

=== modified file 'src/base/md5.h'
--- src/base/md5.h	2014-07-20 07:47:15 +0000
+++ src/base/md5.h	2014-09-18 15:54:00 +0000
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 /* Structure to save state of computation between the single steps.  */
-struct md5_ctx {
+struct Md5Ctx {
 	uint32_t A;
 	uint32_t B;
 	uint32_t C;
@@ -43,24 +43,24 @@
 /**
  * One MD5 checksum is simply an array of 16 bytes.
  */
-struct md5_checksum {
+struct Md5Checksum {
 	uint8_t data[16];
 
 	std::string str() const;
 
-	bool operator== (const md5_checksum & o) const {
+	bool operator== (const Md5Checksum & o) const {
 		return memcmp(data, o.data, sizeof(data)) == 0;
 	}
 
-	bool operator!= (const md5_checksum & o) const {return !(*this == o);}
+	bool operator!= (const Md5Checksum & o) const {return !(*this == o);}
 };
 
 // Note that the implementation of MD5Checksum is basically just
 // a wrapper around these functions, which have been taken basically
 // verbatim (with some whitespace changes) from the GNU tools; see below.
-void * md5_finish_ctx (md5_ctx *, void * resbuf);
-void md5_process_bytes (void const * buffer, uint32_t len, md5_ctx *);
-void md5_process_block (void const * buffer, uint32_t len, md5_ctx *);
+void * md5_finish_ctx (Md5Ctx *, void * resbuf);
+void md5_process_bytes (void const * buffer, uint32_t len, Md5Ctx *);
+void md5_process_block (void const * buffer, uint32_t len, Md5Ctx *);
 
 /**
  * This class is responsible for creating a streaming md5 checksum.
@@ -110,18 +110,18 @@
 	/// before this function.
 	///
 	/// \return a pointer to an array of 16 bytes containing the checksum.
-	const md5_checksum & GetChecksum() const {
+	const Md5Checksum & GetChecksum() const {
 		assert(!can_handle_data);
 		return sum;
 	}
 
 private:
 	bool can_handle_data;
-	md5_checksum sum;
-	md5_ctx ctx;
+	Md5Checksum sum;
+	Md5Ctx ctx;
 };
 
 class _DummyMD5Base {};
-typedef MD5Checksum<_DummyMD5Base> SimpleMD5Checksum;
+using SimpleMD5Checksum = MD5Checksum<_DummyMD5Base>;
 
 #endif  // end of include guard: WL_BASE_MD5_H

=== modified file 'src/base/warning.h'
--- src/base/warning.h	2014-07-26 10:43:23 +0000
+++ src/base/warning.h	2014-09-18 15:54:00 +0000
@@ -38,8 +38,8 @@
 
 /// Similar exception type as wexception, but without the debug output.
 /// Intended for normal warnings like "map could not be found".
-struct warning : public std::exception {
-	explicit warning (char const * title, char const * message, ...)
+struct WLWarning : public std::exception {
+	explicit WLWarning (char const * title, char const * message, ...)
 	 PRINTF_FORMAT(3, 4);
 
 	/// The target of the returned pointer remains valid during the lifetime of
@@ -48,7 +48,7 @@
 	const char * what() const noexcept override;
 
 protected:
-	warning() {}
+	WLWarning() {}
 	std::string m_what;
 	std::string m_title;
 };

=== modified file 'src/base/wexception.h'
--- src/base/wexception.h	2014-07-26 10:43:23 +0000
+++ src/base/wexception.h	2014-09-18 15:54:00 +0000
@@ -41,23 +41,23 @@
  * Stupid, simple exception class. It has the nice bonus that you can give it
  * sprintf()-style format strings
  */
-struct _wexception : public std::exception {
-	explicit _wexception
+struct WException : public std::exception {
+	explicit WException
 		(const char * file, uint32_t line, const char * fmt, ...)
 	 PRINTF_FORMAT(4, 5);
 
 	/**
     * The target of the returned pointer remains valid during the lifetime of
-	 * the _wexception object.
+	 * the WException object.
 	 */
 	const char * what() const noexcept override;
 
 protected:
-	_wexception() {}
+	WException() {}
 	std::string m_what;
 };
 
-#define wexception(...) _wexception(__FILE__, __LINE__, __VA_ARGS__)
+#define wexception(...) WException(__FILE__, __LINE__, __VA_ARGS__)
 
 
 #endif  // end of include guard: WL_BASE_WEXCEPTION_H

=== modified file 'src/economy/cmd_call_economy_balance.cc'
--- src/economy/cmd_call_economy_balance.cc	2014-07-28 14:17:07 +0000
+++ src/economy/cmd_call_economy_balance.cc	2014-09-18 15:54:00 +0000
@@ -25,12 +25,12 @@
 #include "io/filewrite.h"
 #include "logic/game.h"
 #include "logic/player.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
-Cmd_Call_Economy_Balance::Cmd_Call_Economy_Balance
+CmdCallEconomyBalance::CmdCallEconomyBalance
 	(int32_t const starttime, Economy * const economy, uint32_t const timerid)
 	: GameLogicCommand(starttime)
 {
@@ -42,7 +42,7 @@
  * Called by Cmd_Queue as requested by start_request_timer().
  * Call economy functions to balance supply and request.
  */
-void Cmd_Call_Economy_Balance::execute(Game & game)
+void CmdCallEconomyBalance::execute(Game & game)
 {
 	if (Flag * const flag = m_flag.get(game))
 		flag->get_economy()->balance(m_timerid);
@@ -53,8 +53,8 @@
 /**
  * Read and write
  */
-void Cmd_Call_Economy_Balance::Read
-	(FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader & mol)
+void CmdCallEconomyBalance::Read
+	(FileRead & fr, EditorGameBase & egbase, MapObjectLoader & mol)
 {
 	try {
 		uint16_t const packet_version = fr.Unsigned16();
@@ -84,14 +84,14 @@
 			else
 				m_timerid = 0;
 		} else
-			throw game_data_error
+			throw GameDataError
 				("unknown/unhandled version %u", packet_version);
-	} catch (const _wexception & e) {
+	} catch (const WException & e) {
 		throw wexception("call economy balance: %s", e.what());
 	}
 }
-void Cmd_Call_Economy_Balance::Write
-	(FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
+void CmdCallEconomyBalance::Write
+	(FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
 {
 	fw.Unsigned16(CURRENT_CMD_CALL_ECONOMY_VERSION);
 

=== modified file 'src/economy/cmd_call_economy_balance.h'
--- src/economy/cmd_call_economy_balance.h	2014-07-28 14:17:07 +0000
+++ src/economy/cmd_call_economy_balance.h	2014-09-18 15:54:00 +0000
@@ -27,20 +27,20 @@
 namespace Widelands {
 class Economy;
 class Game;
-class MapMapObjectLoader;
-
-
-struct Cmd_Call_Economy_Balance : public GameLogicCommand {
-	Cmd_Call_Economy_Balance () : GameLogicCommand(0), m_timerid(0) {} ///< for load and save
-
-	Cmd_Call_Economy_Balance (int32_t starttime, Economy *, uint32_t timerid);
+class MapObjectLoader;
+
+
+struct CmdCallEconomyBalance : public GameLogicCommand {
+	CmdCallEconomyBalance () : GameLogicCommand(0), m_timerid(0) {} ///< for load and save
+
+	CmdCallEconomyBalance (int32_t starttime, Economy *, uint32_t timerid);
 
 	void execute (Game &) override;
 
 	uint8_t id() const override {return QUEUE_CMD_CALL_ECONOMY_BALANCE;}
 
-	void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver  &) override;
-	void Read (FileRead  &, Editor_Game_Base &, MapMapObjectLoader &) override;
+	void Write(FileWrite &, EditorGameBase &, MapObjectSaver  &) override;
+	void Read (FileRead  &, EditorGameBase &, MapObjectLoader &) override;
 
 private:
 	OPtr<Flag> m_flag;

=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc	2014-07-28 16:59:54 +0000
+++ src/economy/economy.cc	2014-09-18 15:54:00 +0000
@@ -44,25 +44,25 @@
 	m_owner(player),
 	m_request_timerid(0)
 {
-	const Tribe_Descr & tribe = player.tribe();
-	Ware_Index const nr_wares   = tribe.get_nrwares();
-	Ware_Index const nr_workers = tribe.get_nrworkers();
+	const TribeDescr & tribe = player.tribe();
+	WareIndex const nr_wares   = tribe.get_nrwares();
+	WareIndex const nr_workers = tribe.get_nrworkers();
 	m_wares.set_nrwares(nr_wares);
 	m_workers.set_nrwares(nr_workers);
 
 	player.add_economy(*this);
 
-	m_ware_target_quantities   = new Target_Quantity[nr_wares];
-	for (Ware_Index i = 0; i < nr_wares; ++i) {
-		Target_Quantity tq;
+	m_ware_target_quantities   = new TargetQuantity[nr_wares];
+	for (WareIndex i = 0; i < nr_wares; ++i) {
+		TargetQuantity tq;
 		tq.permanent =
 			tribe.get_ware_descr(i)->default_target_quantity();
 		tq.last_modified = 0;
 		m_ware_target_quantities[i] = tq;
 	}
-	m_worker_target_quantities = new Target_Quantity[nr_workers];
-	for (Ware_Index i = 0; i < nr_workers; ++i) {
-		Target_Quantity tq;
+	m_worker_target_quantities = new TargetQuantity[nr_workers];
+	for (WareIndex i = 0; i < nr_workers; ++i) {
+		TargetQuantity tq;
 		tq.permanent =
 			tribe.get_worker_descr(i)->default_target_quantity();
 		tq.last_modified = 0;
@@ -139,7 +139,7 @@
 
 void Economy::_check_splits()
 {
-	Editor_Game_Base & egbase = owner().egbase();
+	EditorGameBase & egbase = owner().egbase();
 	Map & map = egbase.map();
 
 	while (m_split_checks.size()) {
@@ -320,29 +320,29 @@
 }
 
 /**
- * Set the target quantities for the given Ware_Index to the
+ * Set the target quantities for the given WareIndex to the
  * numbers given in permanent. Also update the last
  * modification time.
  *
  * This is called from Cmd_ResetTargetQuantity and Cmd_SetTargetQuantity
  */
 void Economy::set_ware_target_quantity
-	(Ware_Index const ware_type,
+	(WareIndex const ware_type,
 	 uint32_t   const permanent,
 	 Time       const mod_time)
 {
-	Target_Quantity & tq = m_ware_target_quantities[ware_type];
+	TargetQuantity & tq = m_ware_target_quantities[ware_type];
 	tq.permanent = permanent;
 	tq.last_modified = mod_time;
 }
 
 
 void Economy::set_worker_target_quantity
-	(Ware_Index const ware_type,
+	(WareIndex const ware_type,
 	 uint32_t   const permanent,
 	 Time       const mod_time)
 {
-	Target_Quantity & tq = m_worker_target_quantities[ware_type];
+	TargetQuantity & tq = m_worker_target_quantities[ware_type];
 	tq.permanent = permanent;
 	tq.last_modified = mod_time;
 }
@@ -354,7 +354,7 @@
  * This is also called when a ware is added to the economy through trade or
  * a merger.
 */
-void Economy::add_wares(Ware_Index const id, uint32_t const count)
+void Economy::add_wares(WareIndex const id, uint32_t const count)
 {
 	//log("%p: add(%i, %i)\n", this, id, count);
 
@@ -363,7 +363,7 @@
 
 	// TODO(unknown): add to global player inventory?
 }
-void Economy::add_workers(Ware_Index const id, uint32_t const count)
+void Economy::add_workers(WareIndex const id, uint32_t const count)
 {
 	//log("%p: add(%i, %i)\n", this, id, count);
 
@@ -379,7 +379,7 @@
  * This is also called when a ware is removed from the economy through trade or
  * a split of the Economy.
 */
-void Economy::remove_wares(Ware_Index const id, uint32_t const count)
+void Economy::remove_wares(WareIndex const id, uint32_t const count)
 {
 	assert(id < m_owner.tribe().get_nrwares());
 	//log("%p: remove(%i, %i) from %i\n", this, id, count, m_wares.stock(id));
@@ -394,7 +394,7 @@
  * This is also called when a worker is removed from the economy through
  * a split of the Economy.
  */
-void Economy::remove_workers(Ware_Index const id, uint32_t const count)
+void Economy::remove_workers(WareIndex const id, uint32_t const count)
 {
 	//log("%p: remove(%i, %i) from %i\n", this, id, count, m_workers.stock(id));
 
@@ -499,7 +499,7 @@
 }
 
 
-bool Economy::needs_ware(Ware_Index const ware_type) const {
+bool Economy::needs_ware(WareIndex const ware_type) const {
 	uint32_t const t = ware_target_quantity(ware_type).permanent;
 	uint32_t quantity = 0;
 	for (const Warehouse * wh : m_warehouses) {
@@ -511,7 +511,7 @@
 }
 
 
-bool Economy::needs_worker(Ware_Index const worker_type) const {
+bool Economy::needs_worker(WareIndex const worker_type) const {
 	uint32_t const t = worker_target_quantity(worker_type).permanent;
 	uint32_t quantity = 0;
 	for (const Warehouse * wh : m_warehouses) {
@@ -531,17 +531,17 @@
 */
 void Economy::_merge(Economy & e)
 {
-	for (Ware_Index i = m_owner.tribe().get_nrwares(); i;) {
+	for (WareIndex i = m_owner.tribe().get_nrwares(); i;) {
 		--i;
-		Target_Quantity other_tq = e.m_ware_target_quantities[i];
-		Target_Quantity & this_tq = m_ware_target_quantities[i];
+		TargetQuantity other_tq = e.m_ware_target_quantities[i];
+		TargetQuantity & this_tq = m_ware_target_quantities[i];
 		if (this_tq.last_modified < other_tq.last_modified)
 			this_tq = other_tq;
 	}
-	for (Ware_Index i = m_owner.tribe().get_nrworkers(); i;) {
+	for (WareIndex i = m_owner.tribe().get_nrworkers(); i;) {
 		--i;
-		Target_Quantity other_tq = e.m_worker_target_quantities[i];
-		Target_Quantity & this_tq = m_worker_target_quantities[i];
+		TargetQuantity other_tq = e.m_worker_target_quantities[i];
+		TargetQuantity & this_tq = m_worker_target_quantities[i];
 		if (this_tq.last_modified < other_tq.last_modified)
 			this_tq = other_tq;
 	}
@@ -584,11 +584,11 @@
 
 	Economy & e = *new Economy(m_owner);
 
-	for (Ware_Index i = m_owner.tribe().get_nrwares  (); i;) {
+	for (WareIndex i = m_owner.tribe().get_nrwares  (); i;) {
 		--i;
 		e.m_ware_target_quantities[i] = m_ware_target_quantities[i];
 	}
-	for (Ware_Index i = m_owner.tribe().get_nrworkers(); i;) {
+	for (WareIndex i = m_owner.tribe().get_nrworkers(); i;) {
 		--i;
 		e.m_worker_target_quantities[i] = m_worker_target_quantities[i];
 	}
@@ -613,7 +613,7 @@
 {
 	if (upcast(Game, game, &m_owner.egbase()))
 		game->cmdqueue().enqueue
-			(new Cmd_Call_Economy_Balance
+			(new CmdCallEconomyBalance
 			 	(game->get_gametime() + delta, this, m_request_timerid));
 }
 
@@ -694,12 +694,9 @@
 	};
 };
 
-typedef
-	std::priority_queue
-	<RequestSupplyPair,
+using RSPairQueue = std::priority_queue<RequestSupplyPair,
 	std::vector<RequestSupplyPair>,
-	RequestSupplyPair::Compare>
-	RSPairQueue;
+	RequestSupplyPair::Compare>;
 
 struct RSPairStruct {
 	RSPairQueue queue;
@@ -807,12 +804,12 @@
  * Check whether there is a supply for the given request. If the request is a
  * worker request without supply, attempt to create a new worker in a warehouse.
  */
-void Economy::_create_requested_worker(Game & game, Ware_Index index)
+void Economy::_create_requested_worker(Game & game, WareIndex index)
 {
 	unsigned demand = 0;
 
 	bool soldier_level_check;
-	const Tribe_Descr & tribe = owner().tribe();
+	const TribeDescr & tribe = owner().tribe();
 	const WorkerDescr & w_desc = *tribe.get_worker_descr(index);
 
 	// Make a dummy soldier, which should never be assigned to any economy
@@ -935,9 +932,9 @@
 	if (!warehouses().size())
 		return;
 
-	const Tribe_Descr & tribe = owner().tribe();
+	const TribeDescr & tribe = owner().tribe();
 	for
-		(Ware_Index index = 0;
+		(WareIndex index = 0;
 		 index < tribe.get_nrworkers(); ++index)
 	{
 		if (!owner().is_worker_type_allowed(index))
@@ -954,7 +951,7 @@
  */
 static bool accept_warehouse_if_policy
 	(Warehouse & wh, WareWorker type,
-	 Ware_Index ware, Warehouse::StockPolicy policy)
+	 WareIndex ware, Warehouse::StockPolicy policy)
 {
 	return wh.get_stock_policy(type, ware) == policy;
 }
@@ -968,7 +965,7 @@
 	if (!warehouses().size())
 		return;
 
-	typedef std::vector<std::pair<Supply *, Warehouse *> > Assignments;
+	using Assignments = std::vector<std::pair<Supply *, Warehouse *>>;
 	Assignments assignments;
 
 	for (uint32_t idx = 0; idx < m_supplies.get_nrsupplies(); ++idx) {
@@ -977,7 +974,7 @@
 			continue;
 
 		WareWorker type;
-		Ware_Index ware;
+		WareIndex ware;
 		supply.get_ware_type(type, ware);
 
 		bool haveprefer = false;
@@ -1041,7 +1038,7 @@
 		return;
 	++m_request_timerid;
 
-	Game & game = ref_cast<Game, Editor_Game_Base>(owner().egbase());
+	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
 
 	_check_splits();
 

=== modified file 'src/economy/economy.h'
--- src/economy/economy.h	2014-07-14 19:44:28 +0000
+++ src/economy/economy.h	2014-09-18 15:54:00 +0000
@@ -87,7 +87,7 @@
 	/// The last_modified time is used to determine which setting to use when
 	/// economies are merged. The setting that was modified most recently will
 	/// be used for the merged economy.
-	struct Target_Quantity {
+	struct TargetQuantity {
 		uint32_t permanent;
 		Time     last_modified;
 	};
@@ -106,7 +106,7 @@
 		 WareWorker type,
 		 int32_t cost_cutoff = -1);
 
-	typedef boost::function<bool (Warehouse &)> WarehouseAcceptFn;
+	using WarehouseAcceptFn = boost::function<bool (Warehouse &)>;
 	Warehouse * find_closest_warehouse
 		(Flag & start, WareWorker type = wwWORKER, Route * route = nullptr,
 		 uint32_t cost_cutoff = 0,
@@ -120,14 +120,14 @@
 	// (i.e. an Expedition ship).
 	Flag* get_arbitrary_flag();
 
-	void set_ware_target_quantity  (Ware_Index, uint32_t, Time);
-	void set_worker_target_quantity(Ware_Index, uint32_t, Time);
-
-	void    add_wares  (Ware_Index, uint32_t count = 1);
-	void remove_wares  (Ware_Index, uint32_t count = 1);
-
-	void    add_workers(Ware_Index, uint32_t count = 1);
-	void remove_workers(Ware_Index, uint32_t count = 1);
+	void set_ware_target_quantity  (WareIndex, uint32_t, Time);
+	void set_worker_target_quantity(WareIndex, uint32_t, Time);
+
+	void    add_wares  (WareIndex, uint32_t count = 1);
+	void remove_wares  (WareIndex, uint32_t count = 1);
+
+	void    add_workers(WareIndex, uint32_t count = 1);
+	void remove_workers(WareIndex, uint32_t count = 1);
 
 	void    add_warehouse(Warehouse &);
 	void remove_warehouse(Warehouse &);
@@ -140,33 +140,33 @@
 	void remove_supply(Supply &);
 
 	/// information about this economy
-	WareList::count_type stock_ware  (Ware_Index const i) {
+	WareList::WareCount stock_ware  (WareIndex const i) {
 		return m_wares  .stock(i);
 	}
-	WareList::count_type stock_worker(Ware_Index const i) {
+	WareList::WareCount stock_worker(WareIndex const i) {
 		return m_workers.stock(i);
 	}
 
 	/// Whether the economy needs more of this ware type.
 	/// Productionsites may ask this before they produce, to avoid depleting a
 	/// ware type by overproducing another from it.
-	bool needs_ware(Ware_Index) const;
+	bool needs_ware(WareIndex) const;
 
 	/// Whether the economy needs more of this worker type.
 	/// Productionsites may ask this before they produce, to avoid depleting a
 	/// ware type by overproducing a worker type from it.
-	bool needs_worker(Ware_Index) const;
+	bool needs_worker(WareIndex) const;
 
-	const Target_Quantity & ware_target_quantity  (Ware_Index const i) const {
-		return m_ware_target_quantities[i];
-	}
-	Target_Quantity       & ware_target_quantity  (Ware_Index const i)       {
-		return m_ware_target_quantities[i];
-	}
-	const Target_Quantity & worker_target_quantity(Ware_Index const i) const {
+	const TargetQuantity & ware_target_quantity  (WareIndex const i) const {
+		return m_ware_target_quantities[i];
+	}
+	TargetQuantity       & ware_target_quantity  (WareIndex const i)       {
+		return m_ware_target_quantities[i];
+	}
+	const TargetQuantity & worker_target_quantity(WareIndex const i) const {
 		return m_worker_target_quantities[i];
 	}
-	Target_Quantity       & worker_target_quantity(Ware_Index const i)       {
+	TargetQuantity       & worker_target_quantity(WareIndex const i)       {
 		return m_worker_target_quantities[i];
 	}
 
@@ -201,18 +201,18 @@
 	void _balance_requestsupply(Game &);
 	void _handle_active_supplies(Game &);
 	void _create_requested_workers(Game &);
-	void _create_requested_worker(Game &, Ware_Index);
+	void _create_requested_worker(Game &, WareIndex);
 
 	bool   _has_request(Request &);
 
 /*************/
 /* Variables */
 /*************/
-	typedef std::vector<Request *> RequestList;
+	using RequestList = std::vector<Request *>;
 
 	Player & m_owner;
 
-	typedef std::vector<Flag *> Flags;
+	using Flags = std::vector<Flag *>;
 	Flags m_flags;
 	WareList m_wares;     ///< virtual storage with all wares in this Economy
 	WareList m_workers;   ///< virtual storage with all workers in this Economy
@@ -221,11 +221,11 @@
 	RequestList m_requests; ///< requests
 	SupplyList m_supplies;
 
-	Target_Quantity        * m_ware_target_quantities;
-	Target_Quantity        * m_worker_target_quantities;
+	TargetQuantity        * m_ware_target_quantities;
+	TargetQuantity        * m_worker_target_quantities;
 	Router                 * m_router;
 
-	typedef std::pair<OPtr<Flag>, OPtr<Flag> > SplitPair;
+	using SplitPair = std::pair<OPtr<Flag>, OPtr<Flag>>;
 	std::vector<SplitPair> m_split_checks;
 
 	/**

=== modified file 'src/economy/economy_data_packet.cc'
--- src/economy/economy_data_packet.cc	2014-07-20 07:42:37 +0000
+++ src/economy/economy_data_packet.cc	2014-09-18 15:54:00 +0000
@@ -24,8 +24,8 @@
 #include "io/filewrite.h"
 #include "logic/player.h"
 #include "logic/tribe.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 #define CURRENT_ECONOMY_VERSION 3
 
@@ -39,13 +39,13 @@
 		if (1 <= version && version <= CURRENT_ECONOMY_VERSION) {
 			if (2 <= version)
 				try {
-					const Tribe_Descr & tribe = m_eco->owner().tribe();
+					const TribeDescr & tribe = m_eco->owner().tribe();
 					while (Time const last_modified = fr.Unsigned32()) {
 						char const * const type_name = fr.CString();
 						uint32_t const permanent = fr.Unsigned32();
 						if (version <= 2)
 							fr.Unsigned32();
-						Ware_Index i = tribe.ware_index(type_name);
+						WareIndex i = tribe.ware_index(type_name);
 						if (i != INVALID_INDEX) {
 							if (tribe.get_ware_descr(i)->default_target_quantity() ==
 							    std::numeric_limits<uint32_t>::max())
@@ -54,10 +54,10 @@
 								    "ignoring\n",
 								    type_name);
 							else {
-								Economy::Target_Quantity & tq =
+								Economy::TargetQuantity & tq =
 									m_eco->m_ware_target_quantities[i];
 								if (tq.last_modified)
-									throw game_data_error
+									throw GameDataError
 										("duplicated entry for %s", type_name);
 								tq.permanent         = permanent;
 								tq.last_modified     = last_modified;
@@ -73,10 +73,10 @@
 									 "ignoring\n",
 									 type_name);
 							else {
-								Economy::Target_Quantity & tq =
+								Economy::TargetQuantity & tq =
 									m_eco->m_worker_target_quantities[i];
 								if (tq.last_modified)
-									throw game_data_error
+									throw GameDataError
 										("duplicated entry for %s", type_name);
 								tq.permanent         = permanent;
 								tq.last_modified     = last_modified;
@@ -88,25 +88,25 @@
 								 "%s, ignoring\n",
 								 type_name, tribe.name().c_str());
 					}
-				} catch (const _wexception & e) {
-					throw game_data_error("target quantities: %s", e.what());
+				} catch (const WException & e) {
+					throw GameDataError("target quantities: %s", e.what());
 				}
 			m_eco->m_request_timerid = fr.Unsigned32();
 		} else {
-			throw game_data_error("unknown version %u", version);
+			throw GameDataError("unknown version %u", version);
 		}
 	} catch (const std::exception & e) {
-		throw game_data_error("economy: %s", e.what());
+		throw GameDataError("economy: %s", e.what());
 	}
 }
 
 void EconomyDataPacket::Write(FileWrite & fw)
 {
 	fw.Unsigned16(CURRENT_ECONOMY_VERSION);
-	const Tribe_Descr & tribe = m_eco->owner().tribe();
-	for (Ware_Index i = tribe.get_nrwares(); i;) {
+	const TribeDescr & tribe = m_eco->owner().tribe();
+	for (WareIndex i = tribe.get_nrwares(); i;) {
 		--i;
-		const Economy::Target_Quantity & tq =
+		const Economy::TargetQuantity & tq =
 			m_eco->m_ware_target_quantities[i];
 		if (Time const last_modified = tq.last_modified) {
 			fw.Unsigned32(last_modified);
@@ -114,9 +114,9 @@
 			fw.Unsigned32(tq.permanent);
 		}
 	}
-	for (Ware_Index i = tribe.get_nrworkers(); i;) {
+	for (WareIndex i = tribe.get_nrworkers(); i;) {
 		--i;
-		const Economy::Target_Quantity & tq =
+		const Economy::TargetQuantity & tq =
 			m_eco->m_worker_target_quantities[i];
 		if (Time const last_modified = tq.last_modified) {
 			fw.Unsigned32(last_modified);

=== modified file 'src/economy/economy_data_packet.h'
--- src/economy/economy_data_packet.h	2014-07-28 14:17:07 +0000
+++ src/economy/economy_data_packet.h	2014-09-18 15:54:00 +0000
@@ -26,8 +26,8 @@
 namespace Widelands {
 class Economy;
 class Game;
-class MapMapObjectLoader;
-struct MapMapObjectSaver;
+class MapObjectLoader;
+struct MapObjectSaver;
 
 class EconomyDataPacket {
 	public:

=== modified file 'src/economy/flag.cc'
--- src/economy/flag.cc	2014-07-28 16:59:54 +0000
+++ src/economy/flag.cc	2014-09-18 15:54:00 +0000
@@ -80,7 +80,7 @@
 			log("Flag: ouch! road left\n");
 }
 
-void Flag::load_finish(Editor_Game_Base & egbase) {
+void Flag::load_finish(EditorGameBase & egbase) {
 	auto should_be_deleted = [&egbase, this](const OPtr<Worker>& r) {
 		Worker& worker = *r.get(egbase);
 		Bob::State const* const state = worker.get_state(Worker::taskWaitforcapacity);
@@ -112,7 +112,7 @@
  * Create a flag at the given location
 */
 Flag::Flag
-	(Editor_Game_Base & egbase, Player & owning_player, Coords const coords)
+	(EditorGameBase & egbase, Player & owning_player, Coords const coords)
 	:
 	PlayerImmovable       (g_flag_descr),
 	m_building            (nullptr),
@@ -196,7 +196,7 @@
 /**
  * Call this only from the Building init!
 */
-void Flag::attach_building(Editor_Game_Base & egbase, Building & building)
+void Flag::attach_building(EditorGameBase & egbase, Building & building)
 {
 	assert(!m_building || m_building == &building);
 
@@ -212,7 +212,7 @@
 /**
  * Call this only from the Building cleanup!
 */
-void Flag::detach_building(Editor_Game_Base & egbase)
+void Flag::detach_building(EditorGameBase & egbase)
 {
 	assert(m_building);
 
@@ -251,7 +251,7 @@
  * Return all positions we occupy on the map. For a Flag, this is only one
 */
 BaseImmovable::PositionList Flag::get_positions
-	(const Editor_Game_Base &) const
+	(const EditorGameBase &) const
 {
 	PositionList rv;
 	rv.push_back(m_position);
@@ -368,7 +368,7 @@
 }
 
 
-void Flag::add_ware(Editor_Game_Base & egbase, WareInstance & ware)
+void Flag::add_ware(EditorGameBase & egbase, WareInstance & ware)
 {
 
 	assert(m_ware_filled < m_ware_capacity);
@@ -558,7 +558,7 @@
  * Force a removal of the given ware from this flag.
  * Called by \ref WareInstance::cleanup()
 */
-void Flag::remove_ware(Editor_Game_Base & egbase, WareInstance * const ware)
+void Flag::remove_ware(EditorGameBase & egbase, WareInstance * const ware)
 {
 	for (int32_t i = 0; i < m_ware_filled; ++i) {
 		if (m_wares[i].ware != ware)
@@ -694,7 +694,7 @@
 	m_always_call_for_flag = nullptr;
 }
 
-void Flag::init(Editor_Game_Base & egbase)
+void Flag::init(EditorGameBase & egbase)
 {
 	PlayerImmovable::init(egbase);
 
@@ -706,7 +706,7 @@
 /**
  * Detach building and free roads.
 */
-void Flag::cleanup(Editor_Game_Base & egbase)
+void Flag::cleanup(EditorGameBase & egbase)
 {
 	//molog("Flag::cleanup\n");
 
@@ -753,7 +753,7 @@
  * \ref Flag::cleanup(). This function is needed to ensure a fire is created
  * when a player removes a flag.
 */
-void Flag::destroy(Editor_Game_Base & egbase)
+void Flag::destroy(EditorGameBase & egbase)
 {
 	if (m_building) {
 		m_building->destroy(egbase);
@@ -768,7 +768,7 @@
  * the given program once it's completed.
 */
 void Flag::add_flag_job
-	(Game &, Ware_Index const workerware, const std::string & programname)
+	(Game &, WareIndex const workerware, const std::string & programname)
 {
 	FlagJob j;
 
@@ -787,7 +787,7 @@
 void Flag::flag_job_request_callback
 	(Game            &       game,
 	 Request         &       rq,
-	 Ware_Index,
+	 WareIndex,
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
@@ -811,7 +811,7 @@
 	flag.molog("BUG: flag_job_request_callback: worker not found in list\n");
 }
 
-void Flag::log_general_info(const Widelands::Editor_Game_Base & egbase)
+void Flag::log_general_info(const Widelands::EditorGameBase & egbase)
 {
 	molog("Flag at %i,%i\n", m_position.x, m_position.y);
 

=== modified file 'src/economy/flag.h'
--- src/economy/flag.h	2014-07-28 16:59:54 +0000
+++ src/economy/flag.h	2014-09-18 15:54:00 +0000
@@ -61,23 +61,23 @@
  * WALK_xx in all "direction" parameters.
  */
 struct Flag : public PlayerImmovable, public RoutingNode {
-	typedef std::vector<const WareInstance *> Wares;
+	using Wares = std::vector<const WareInstance *>;
 
 	friend class Economy;
 	friend class FlagQueue;
-	friend class Map_Flagdata_Data_Packet; // has to read/write this to a file
-	friend struct Map_Ware_Data_Packet;     // has to look at pending wares
-	friend struct Map_Waredata_Data_Packet; // has to look at pending wares
+	friend class MapFlagdataPacket; // has to read/write this to a file
+	friend struct MapWarePacket;     // has to look at pending wares
+	friend struct MapWaredataPacket; // has to look at pending wares
 	friend struct Router;
 
 	const FlagDescr& descr() const;
 
 	Flag(); /// empty flag for savegame loading
-	Flag(Editor_Game_Base &, Player & owner, Coords); /// create a new flag
+	Flag(EditorGameBase &, Player & owner, Coords); /// create a new flag
 	~Flag() override;
 
-	void load_finish(Editor_Game_Base &) override;
-	void destroy(Editor_Game_Base &) override;
+	void load_finish(EditorGameBase &) override;
+	void destroy(EditorGameBase &) override;
 
 	int32_t  get_size    () const override;
 	bool get_passable() const override;
@@ -85,15 +85,15 @@
 	Flag & base_flag() override;
 
 	const Coords & get_position() const override {return m_position;}
-	PositionList get_positions (const Editor_Game_Base &) const override;
+	PositionList get_positions (const EditorGameBase &) const override;
 	void get_neighbours(WareWorker type, RoutingNodeNeighbours &) override;
 	int32_t get_waitcost() const {return m_ware_filled;}
 
 	void set_economy(Economy *) override;
 
 	Building * get_building() const {return m_building;}
-	void attach_building(Editor_Game_Base &, Building &);
-	void detach_building(Editor_Game_Base &);
+	void attach_building(EditorGameBase &, Building &);
+	void detach_building(EditorGameBase &);
 
 	bool has_road() const {
 		return
@@ -114,7 +114,7 @@
 	uint32_t current_wares() const {return m_ware_filled;}
 	void wait_for_capacity(Game &, Worker &);
 	void skip_wait_for_capacity(Game &, Worker &);
-	void add_ware(Editor_Game_Base &, WareInstance &);
+	void add_ware(EditorGameBase &, WareInstance &);
 	bool has_pending_ware(Game &, Flag & destflag);
 	bool ack_pickup(Game &, Flag & destflag);
 	bool cancel_pickup(Game &, Flag & destflag);
@@ -124,21 +124,21 @@
 	void call_carrier(Game &, WareInstance &, PlayerImmovable * nextstep);
 	void update_wares(Game &, Flag * other);
 
-	void remove_ware(Editor_Game_Base &, WareInstance * const);
-
-	void add_flag_job(Game &, Ware_Index workerware, const std::string & programname);
-
-	void log_general_info(const Editor_Game_Base &) override;
+	void remove_ware(EditorGameBase &, WareInstance * const);
+
+	void add_flag_job(Game &, WareIndex workerware, const std::string & programname);
+
+	void log_general_info(const EditorGameBase &) override;
 
 protected:
-	void init(Editor_Game_Base &) override;
-	void cleanup(Editor_Game_Base &) override;
+	void init(EditorGameBase &) override;
+	void cleanup(EditorGameBase &) override;
 
-	void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
+	void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
 
 	void wake_up_capacity_queue(Game &);
 
-	static void flag_job_request_callback(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
+	static void flag_job_request_callback(Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
 
 	void set_flag_position(Coords coords);
 
@@ -169,10 +169,10 @@
 	/// the given flag
 	Flag        * m_always_call_for_flag;
 
-	typedef std::vector<OPtr<Worker> > CapacityWaitQueue;
+	using CapacityWaitQueue = std::vector<OPtr<Worker>>;
 	CapacityWaitQueue m_capacity_wait; ///< workers waiting for capacity
 
-	typedef std::list<FlagJob> FlagJobs;
+	using FlagJobs = std::list<FlagJob>;
 	FlagJobs m_flag_jobs;
 };
 

=== modified file 'src/economy/fleet.cc'
--- src/economy/fleet.cc	2014-07-28 16:59:54 +0000
+++ src/economy/fleet.cc	2014-09-18 15:54:00 +0000
@@ -35,8 +35,8 @@
 #include "logic/player.h"
 #include "logic/ship.h"
 #include "logic/warehouse.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
@@ -101,7 +101,7 @@
  * Initialize the fleet, including a search through the map
  * to rejoin with the next other fleet we can find.
  */
-void Fleet::init(Editor_Game_Base & egbase)
+void Fleet::init(EditorGameBase & egbase)
 {
 	MapObject::init(egbase);
 
@@ -140,7 +140,7 @@
  * Search the map, starting at our ships and ports, for another fleet
  * of the same player.
  */
-void Fleet::find_other_fleet(Editor_Game_Base & egbase)
+void Fleet::find_other_fleet(EditorGameBase & egbase)
 {
 	Map & map = egbase.map();
 	MapAStar<StepEvalFindFleet> astar(map, StepEvalFindFleet());
@@ -192,7 +192,7 @@
 /**
  * Merge the @p other fleet into this fleet, and remove the other fleet.
  */
-void Fleet::merge(Editor_Game_Base & egbase, Fleet * other)
+void Fleet::merge(EditorGameBase & egbase, Fleet * other)
 {
 	if (m_ports.empty() && !other->m_ports.empty()) {
 		other->merge(egbase, this);
@@ -244,7 +244,7 @@
 	}
 }
 
-void Fleet::cleanup(Editor_Game_Base & egbase)
+void Fleet::cleanup(EditorGameBase & egbase)
 {
 	while (!m_ports.empty()) {
 		PortDock * pd = m_ports.back();
@@ -371,7 +371,7 @@
 	}
 }
 
-void Fleet::remove_ship(Editor_Game_Base & egbase, Ship * ship)
+void Fleet::remove_ship(EditorGameBase & egbase, Ship * ship)
 {
 	std::vector<Ship *>::iterator it = std::find(m_ships.begin(), m_ships.end(), ship);
 	if (it != m_ships.end()) {
@@ -432,7 +432,7 @@
  * Note that this is done lazily, i.e. the first time a path is actually requested,
  * because path finding is flaky during map loading.
  */
-void Fleet::connect_port(Editor_Game_Base & egbase, uint32_t idx)
+void Fleet::connect_port(EditorGameBase & egbase, uint32_t idx)
 {
 	Map & map = egbase.map();
 	StepEvalFindPorts se;
@@ -508,7 +508,7 @@
 	}
 }
 
-void Fleet::add_port(Editor_Game_Base & /* egbase */, PortDock * port)
+void Fleet::add_port(EditorGameBase & /* egbase */, PortDock * port)
 {
 	m_ports.push_back(port);
 	port->set_fleet(this);
@@ -522,7 +522,7 @@
 	m_portpaths.resize((m_ports.size() * (m_ports.size() - 1)) / 2);
 }
 
-void Fleet::remove_port(Editor_Game_Base & egbase, PortDock * port)
+void Fleet::remove_port(EditorGameBase & egbase, PortDock * port)
 {
 	std::vector<PortDock *>::iterator it = std::find(m_ports.begin(), m_ports.end(), port);
 	if (it != m_ports.end()) {
@@ -582,7 +582,7 @@
 /**
  * Trigger an update of ship scheduling
  */
-void Fleet::update(Editor_Game_Base & egbase)
+void Fleet::update(EditorGameBase & egbase)
 {
 	if (m_act_pending)
 		return;
@@ -672,7 +672,7 @@
 	}
 }
 
-void Fleet::log_general_info(const Editor_Game_Base & egbase)
+void Fleet::log_general_info(const EditorGameBase & egbase)
 {
 	MapObject::log_general_info(egbase);
 
@@ -750,7 +750,7 @@
 }
 
 MapObject::Loader * Fleet::load
-		(Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
+		(EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
 {
 	std::unique_ptr<Loader> loader(new Loader);
 
@@ -758,20 +758,20 @@
 		// The header has been peeled away by the caller
 		uint8_t const version = fr.Unsigned8();
 		if (1 <= version && version <= FLEET_SAVEGAME_VERSION) {
-			Player_Number owner_number = fr.Unsigned8();
+			PlayerNumber owner_number = fr.Unsigned8();
 			if (!owner_number || owner_number > egbase.map().get_nrplayers())
-				throw game_data_error
+				throw GameDataError
 					("owner number is %u but there are only %u players",
 					 owner_number, egbase.map().get_nrplayers());
 
 			Player * owner = egbase.get_player(owner_number);
 			if (!owner)
-				throw game_data_error("owning player %u does not exist", owner_number);
+				throw GameDataError("owning player %u does not exist", owner_number);
 
 			loader->init(egbase, mol, *(new Fleet(*owner)));
 			loader->load(fr, version);
 		} else
-			throw game_data_error("unknown/unhandled version %u", version);
+			throw GameDataError("unknown/unhandled version %u", version);
 	} catch (const std::exception & e) {
 		throw wexception("loading portdock: %s", e.what());
 	}
@@ -779,7 +779,7 @@
 	return loader.release();
 }
 
-void Fleet::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
+void Fleet::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
 {
 	fw.Unsigned8(HeaderFleet);
 	fw.Unsigned8(FLEET_SAVEGAME_VERSION);

=== modified file 'src/economy/fleet.h'
--- src/economy/fleet.h	2014-07-28 16:59:54 +0000
+++ src/economy/fleet.h	2014-09-18 15:54:00 +0000
@@ -84,16 +84,16 @@
 
 	bool active() const;
 
-	void init(Editor_Game_Base &) override;
-	void cleanup(Editor_Game_Base &) override;
-	void update(Editor_Game_Base &);
+	void init(EditorGameBase &) override;
+	void cleanup(EditorGameBase &) override;
+	void update(EditorGameBase &);
 
 	void add_ship(Ship * ship);
-	void remove_ship(Editor_Game_Base & egbase, Ship * ship);
-	void add_port(Editor_Game_Base & egbase, PortDock * port);
-	void remove_port(Editor_Game_Base & egbase, PortDock * port);
+	void remove_ship(EditorGameBase & egbase, Ship * ship);
+	void add_port(EditorGameBase & egbase, PortDock * port);
+	void remove_port(EditorGameBase & egbase, PortDock * port);
 
-	void log_general_info(const Editor_Game_Base &) override;
+	void log_general_info(const EditorGameBase &) override;
 
 	bool get_path(PortDock & start, PortDock & end, Path & path);
 	void add_neighbours(PortDock & pd, std::vector<RoutingNodeNeighbour> & neighbours);
@@ -102,10 +102,10 @@
 	void act(Game &, uint32_t data) override;
 
 private:
-	void find_other_fleet(Editor_Game_Base & egbase);
-	void merge(Editor_Game_Base & egbase, Fleet * other);
+	void find_other_fleet(EditorGameBase & egbase);
+	void merge(EditorGameBase & egbase, Fleet * other);
 	void check_merge_economy();
-	void connect_port(Editor_Game_Base & egbase, uint32_t idx);
+	void connect_port(EditorGameBase & egbase, uint32_t idx);
 
 	PortPath & portpath(uint32_t i, uint32_t j);
 	const PortPath & portpath(uint32_t i, uint32_t j) const;
@@ -142,10 +142,10 @@
 
 public:
 	bool has_new_save_support() override {return true;}
-	void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
+	void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
 
 	static MapObject::Loader * load
-		(Editor_Game_Base &, MapMapObjectLoader &, FileRead &);
+		(EditorGameBase &, MapObjectLoader &, FileRead &);
 };
 
 } // namespace Widelands

=== modified file 'src/economy/idleworkersupply.cc'
--- src/economy/idleworkersupply.cc	2014-07-20 07:42:37 +0000
+++ src/economy/idleworkersupply.cc	2014-09-18 15:54:00 +0000
@@ -76,7 +76,7 @@
 	return m_worker.get_transfer();
 }
 
-void IdleWorkerSupply::get_ware_type(WareWorker & type, Ware_Index & ware) const
+void IdleWorkerSupply::get_ware_type(WareWorker & type, WareIndex & ware) const
 {
 	type = wwWORKER;
 	ware = m_worker.descr().worker_index();

=== modified file 'src/economy/idleworkersupply.h'
--- src/economy/idleworkersupply.h	2014-07-26 10:43:23 +0000
+++ src/economy/idleworkersupply.h	2014-09-18 15:54:00 +0000
@@ -35,7 +35,7 @@
 
 	bool is_active() const override;
 	bool has_storage() const override;
-	void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
+	void get_ware_type(WareWorker & type, WareIndex & ware) const override;
 	void send_to_storage(Game &, Warehouse * wh) override;
 
 	uint32_t nr_supplies(const Game &, const Request &) const override;

=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc	2014-07-28 16:59:54 +0000
+++ src/economy/portdock.cc	2014-09-18 15:54:00 +0000
@@ -34,8 +34,8 @@
 #include "logic/ship.h"
 #include "logic/warehouse.h"
 #include "logic/widelands_geometry_io.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 #include "wui/interactive_gamebase.h"
 
 namespace Widelands {
@@ -106,7 +106,7 @@
 }
 
 PortDock::PositionList PortDock::get_positions
-	(const Editor_Game_Base &) const
+	(const EditorGameBase &) const
 {
 	return m_dockpoints;
 }
@@ -154,12 +154,12 @@
 
 
 void PortDock::draw
-		(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&)
+		(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&)
 {
 	// do nothing
 }
 
-void PortDock::init(Editor_Game_Base & egbase)
+void PortDock::init(EditorGameBase & egbase)
 {
 	PlayerImmovable::init(egbase);
 
@@ -174,7 +174,7 @@
  * Create our initial singleton @ref Fleet. The fleet code ensures
  * that we merge with a larger fleet when possible.
  */
-void PortDock::init_fleet(Editor_Game_Base & egbase)
+void PortDock::init_fleet(EditorGameBase & egbase)
 {
 	Fleet * fleet = new Fleet(owner());
 	fleet->add_port(egbase, this);
@@ -182,7 +182,7 @@
 	// Note: the Fleet calls our set_fleet automatically
 }
 
-void PortDock::cleanup(Editor_Game_Base & egbase)
+void PortDock::cleanup(EditorGameBase & egbase)
 {
 	if (egbase.objects().object_still_available(m_warehouse)) {
 		// Transfer all our wares into the warehouse.
@@ -344,7 +344,7 @@
 			// The expedition goods are now on the ship, so from now on it is independent from the port
 			// and thus we switch the port to normal, so we could even start a new expedition,
 			cancel_expedition(game);
-			if (upcast(Interactive_GameBase, igb, game.get_ibase()))
+			if (upcast(InteractiveGameBase, igb, game.get_ibase()))
 				ship.refresh_window(*igb);
 			return m_fleet->update(game);
 		}
@@ -393,7 +393,7 @@
 /**
  * Return the number of wares or workers of the given type that are waiting at the dock.
  */
-uint32_t PortDock::count_waiting(WareWorker waretype, Ware_Index wareindex)
+uint32_t PortDock::count_waiting(WareWorker waretype, WareIndex wareindex)
 {
 	uint32_t count = 0;
 
@@ -446,7 +446,7 @@
 }
 
 
-void PortDock::log_general_info(const Editor_Game_Base & egbase)
+void PortDock::log_general_info(const EditorGameBase & egbase)
 {
 	PlayerImmovable::log_general_info(egbase);
 
@@ -538,7 +538,7 @@
 }
 
 MapObject::Loader * PortDock::load
-	(Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
+	(EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
 {
 	std::unique_ptr<Loader> loader(new Loader);
 
@@ -550,7 +550,7 @@
 			loader->init(egbase, mol, *new PortDock(nullptr));
 			loader->load(fr, version);
 		} else
-			throw game_data_error("unknown/unhandled version %u", version);
+			throw GameDataError("unknown/unhandled version %u", version);
 	} catch (const std::exception & e) {
 		throw wexception("loading portdock: %s", e.what());
 	}
@@ -558,7 +558,7 @@
 	return loader.release();
 }
 
-void PortDock::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
+void PortDock::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
 {
 	fw.Unsigned8(HeaderPortDock);
 	fw.Unsigned8(PORTDOCK_SAVEGAME_VERSION);

=== modified file 'src/economy/portdock.h'
--- src/economy/portdock.h	2014-07-28 16:59:54 +0000
+++ src/economy/portdock.h	2014-09-18 15:54:00 +0000
@@ -93,12 +93,12 @@
 
 	Flag & base_flag() override;
 	PositionList get_positions
-		(const Editor_Game_Base &) const override;
+		(const EditorGameBase &) const override;
 	void draw
-		(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
+		(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
 
-	void init(Editor_Game_Base &) override;
-	void cleanup(Editor_Game_Base &) override;
+	void init(EditorGameBase &) override;
+	void cleanup(EditorGameBase &) override;
 
 	void add_neighbours(std::vector<RoutingNodeNeighbour> & neighbours);
 
@@ -110,9 +110,9 @@
 
 	void ship_arrived(Game &, Ship &);
 
-	void log_general_info(const Editor_Game_Base &) override;
+	void log_general_info(const EditorGameBase &) override;
 
-	uint32_t count_waiting(WareWorker waretype, Ware_Index wareindex);
+	uint32_t count_waiting(WareWorker waretype, WareIndex wareindex);
 
 	// Returns true if a expedition is started or ready to be send out.
 	bool expedition_started();
@@ -131,7 +131,7 @@
 private:
 	friend struct Fleet;
 
-	void init_fleet(Editor_Game_Base & egbase);
+	void init_fleet(EditorGameBase & egbase);
 	void set_fleet(Fleet * fleet);
 	void _update_shippingitem(Game &, std::vector<ShippingItem>::iterator);
 	void set_need_ship(Game &, bool need);
@@ -162,10 +162,10 @@
 
 public:
 	bool has_new_save_support() override {return true;}
-	void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
+	void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
 
 	static MapObject::Loader * load
-		(Editor_Game_Base &, MapMapObjectLoader &, FileRead &);
+		(EditorGameBase &, MapObjectLoader &, FileRead &);
 };
 
 extern PortdockDescr g_portdock_descr;

=== modified file 'src/economy/request.cc'
--- src/economy/request.cc	2014-07-28 14:23:03 +0000
+++ src/economy/request.cc	2014-09-18 15:54:00 +0000
@@ -34,8 +34,8 @@
 #include "logic/tribe.h"
 #include "logic/warehouse.h"
 #include "logic/worker.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 
 namespace Widelands {
@@ -50,8 +50,8 @@
 
 Request::Request
 	(PlayerImmovable & _target,
-	 Ware_Index const index,
-	 callback_t const cbfn,
+	 WareIndex const index,
+	 CallbackFn const cbfn,
 	 WareWorker const w)
 	:
 	m_type             (w),
@@ -106,19 +106,19 @@
  * them through the data in the file
  */
 void Request::Read
-	(FileRead & fr, Game & game, MapMapObjectLoader & mol)
+	(FileRead & fr, Game & game, MapObjectLoader & mol)
 {
 	try {
 		uint16_t const version = fr.Unsigned16();
 		if (version == 6) {
-			const Tribe_Descr& tribe = m_target.owner().tribe();
+			const TribeDescr& tribe = m_target.owner().tribe();
 			char const* const type_name = fr.CString();
-			Ware_Index const wai = tribe.ware_index(type_name);
+			WareIndex const wai = tribe.ware_index(type_name);
 			if (wai != INVALID_INDEX) {
 				m_type = wwWARE;
 				m_index = wai;
 			} else {
-				Ware_Index const woi = tribe.worker_index(type_name);
+				WareIndex const woi = tribe.worker_index(type_name);
 				if (woi != INVALID_INDEX) {
 					m_type = wwWORKER;
 					m_index = woi;
@@ -161,15 +161,15 @@
 						transfer->set_request(this);
 						m_transfers.push_back(transfer);
 					}
-				} catch (const _wexception& e) {
+				} catch (const WException& e) {
 				   throw wexception("transfer %u: %s", i, e.what());
 				}
 			m_requirements.Read (fr, game, mol);
 			if (!is_open() && m_economy)
 				m_economy->remove_request(*this);
 		} else
-			throw game_data_error("unknown/unhandled version %u", version);
-	} catch (const _wexception & e) {
+			throw GameDataError("unknown/unhandled version %u", version);
+	} catch (const WException & e) {
 		throw wexception("request: %s", e.what());
 	}
 }
@@ -178,14 +178,14 @@
  * Write this request to a file
  */
 void Request::Write
-	(FileWrite & fw, Game & game, MapMapObjectSaver & mos) const
+	(FileWrite & fw, Game & game, MapObjectSaver & mos) const
 {
 	fw.Unsigned16(REQUEST_VERSION);
 
 	//  Target and econmy should be set. Same is true for callback stuff.
 
 	assert(m_type == wwWARE || m_type == wwWORKER);
-	const Tribe_Descr & tribe = m_target.owner().tribe();
+	const TribeDescr & tribe = m_target.owner().tribe();
 	assert(m_type != wwWARE   || m_index < tribe.get_nrwares  ());
 	assert(m_type != wwWORKER || m_index < tribe.get_nrworkers());
 	fw.CString
@@ -227,7 +227,7 @@
  * be delivered. nr is in the range [0..m_count[
 */
 int32_t Request::get_base_required_time
-	(Editor_Game_Base & egbase, uint32_t const nr) const
+	(EditorGameBase & egbase, uint32_t const nr) const
 {
 	if (m_count <= nr) {
 		if (!(m_count == 1 && nr == 1)) {

=== modified file 'src/economy/request.h'
--- src/economy/request.h	2014-07-28 14:17:07 +0000
+++ src/economy/request.h	2014-09-18 15:54:00 +0000
@@ -31,11 +31,11 @@
 namespace Widelands {
 
 class Economy;
-class Editor_Game_Base;
+class EditorGameBase;
 struct Flag;
 class Game;
-class MapMapObjectLoader;
-struct MapMapObjectSaver;
+class MapObjectLoader;
+struct MapObjectSaver;
 struct PlayerImmovable;
 class RequestList;
 struct Requirements;
@@ -63,14 +63,14 @@
 	friend class Economy;
 	friend class RequestList;
 
-	typedef void (*callback_t)
-		(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
+	using CallbackFn = void (*)
+		(Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
 
-	Request(PlayerImmovable & target, Ware_Index, callback_t, WareWorker);
+	Request(PlayerImmovable & target, WareIndex, CallbackFn, WareWorker);
 	~Request();
 
 	PlayerImmovable & target() const {return m_target;}
-	Ware_Index get_index() const {return m_index;}
+	WareIndex get_index() const {return m_index;}
 	WareWorker get_type() const {return m_type;}
 	uint32_t get_count() const {return m_count;}
 	uint32_t get_open_count() const {return m_count - m_transfers.size();}
@@ -93,8 +93,8 @@
 
 	void start_transfer(Game &, Supply &);
 
-	void Read (FileRead  &, Game &, MapMapObjectLoader &);
-	void Write(FileWrite &, Game &, MapMapObjectSaver  &) const;
+	void Read (FileRead  &, Game &, MapObjectLoader &);
+	void Write(FileWrite &, Game &, MapObjectSaver  &) const;
 	Worker * get_transfer_worker();
 
 	//  callbacks for WareInstance/Worker code
@@ -105,14 +105,14 @@
 	const Requirements & get_requirements () const {return m_requirements;}
 
 private:
-	int32_t get_base_required_time(Editor_Game_Base &, uint32_t nr) const;
+	int32_t get_base_required_time(EditorGameBase &, uint32_t nr) const;
 public:
 	void cancel_transfer(uint32_t idx);
 private:
 	void remove_transfer(uint32_t idx);
 	uint32_t find_transfer(Transfer &);
 
-	typedef std::vector<Transfer *> TransferList;
+	using TransferList = std::vector<Transfer *>;
 
 	WareWorker m_type;
 
@@ -126,10 +126,10 @@
 	ConstructionSite * m_target_constructionsite;
 
 	Economy         * m_economy;
-	Ware_Index        m_index;             //  the index of the ware descr
+	WareIndex        m_index;             //  the index of the ware descr
 	uint32_t          m_count;             //  how many do we need in total
 
-	callback_t        m_callbackfn;        //  called on request success
+	CallbackFn        m_callbackfn;        //  called on request success
 
 	//  when do we need the first ware (can be in the past)
 	int32_t           m_required_time;

=== modified file 'src/economy/road.cc'
--- src/economy/road.cc	2014-07-28 16:59:54 +0000
+++ src/economy/road.cc	2014-09-18 15:54:00 +0000
@@ -89,7 +89,7 @@
  * Create a road between the given flags, using the given path.
 */
 Road & Road::create
-	(Editor_Game_Base & egbase,
+	(EditorGameBase & egbase,
 	 Flag & start, Flag & end, const Path & path)
 {
 	assert(start.get_position() == path.get_start());
@@ -121,14 +121,14 @@
 }
 
 BaseImmovable::PositionList Road::get_positions
-	(const Editor_Game_Base & egbase) const
+	(const EditorGameBase & egbase) const
 {
 	Map & map = egbase.map();
 	Coords curf = map.get_fcoords(m_path.get_start());
 
 	PositionList rv;
-	const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
-	for (Path::Step_Vector::size_type steps = 0; steps <  nr_steps + 1; ++steps)
+	const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
+	for (Path::StepVector::size_type steps = 0; steps <  nr_steps + 1; ++steps)
 	{
 		if (steps > 0 && steps < m_path.get_nsteps())
 			rv.push_back(curf);
@@ -156,7 +156,7 @@
  * Set the new path, calculate costs.
  * You have to set start and end flags before calling this function.
 */
-void Road::_set_path(Editor_Game_Base & egbase, const Path & path)
+void Road::_set_path(EditorGameBase & egbase, const Path & path)
 {
 	assert(path.get_nsteps() >= 2);
 	assert(path.get_start() == m_flags[FlagStart]->get_position());
@@ -172,13 +172,13 @@
 /**
  * Add road markings to the map
 */
-void Road::_mark_map(Editor_Game_Base & egbase)
+void Road::_mark_map(EditorGameBase & egbase)
 {
 	Map & map = egbase.map();
 	FCoords curf = map.get_fcoords(m_path.get_start());
 
-	const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
-	for (Path::Step_Vector::size_type steps = 0; steps <  nr_steps + 1; ++steps)
+	const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
+	for (Path::StepVector::size_type steps = 0; steps <  nr_steps + 1; ++steps)
 	{
 		if (steps > 0 && steps < m_path.get_nsteps())
 			set_position(egbase, curf);
@@ -208,12 +208,12 @@
 /**
  * Remove road markings from the map
 */
-void Road::_unmark_map(Editor_Game_Base & egbase) {
+void Road::_unmark_map(EditorGameBase & egbase) {
 	Map & map = egbase.map();
 	FCoords curf(m_path.get_start(), &map[m_path.get_start()]);
 
-	const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
-	for (Path::Step_Vector::size_type steps = 0; steps < nr_steps + 1; ++steps)
+	const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
+	for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps)
 	{
 		if (steps > 0 && steps < m_path.get_nsteps())
 			unset_position(egbase, curf);
@@ -243,7 +243,7 @@
 /**
  * Initialize the road.
 */
-void Road::init(Editor_Game_Base & egbase)
+void Road::init(EditorGameBase & egbase)
 {
 	PlayerImmovable::init(egbase);
 
@@ -258,7 +258,7 @@
  * we needed to have this road already registered
  * as Map Object, thats why this is moved
  */
-void Road::_link_into_flags(Editor_Game_Base & egbase) {
+void Road::_link_into_flags(EditorGameBase & egbase) {
 	assert(m_path.get_nsteps() >= 2);
 
 	// Link into the flags (this will also set our economy)
@@ -303,7 +303,7 @@
 /**
  * Cleanup the road
 */
-void Road::cleanup(Editor_Game_Base & egbase)
+void Road::cleanup(EditorGameBase & egbase)
 {
 
 	for (CarrierSlot& slot : m_carrier_slots) {
@@ -376,7 +376,7 @@
 void Road::_request_carrier_callback
 	(Game            &       game,
 	 Request         &       rq,
-	 Ware_Index,
+	 WareIndex,
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
@@ -412,7 +412,7 @@
 */
 void Road::remove_worker(Worker & w)
 {
-	Editor_Game_Base & egbase = owner().egbase();
+	EditorGameBase & egbase = owner().egbase();
 
 	for (CarrierSlot& slot : m_carrier_slots) {
 		Carrier const * carrier = slot.carrier.get(egbase);
@@ -462,7 +462,7 @@
  * After the split, this road will span [start...new flag]. A new road will
  * be created to span [new flag...end]
 */
-// TODO(SirVer): This need to take an Editor_Game_Base as well.
+// TODO(SirVer): This needs to take an EditorGameBase as well.
 void Road::postsplit(Game & game, Flag & flag)
 {
 	Flag & oldend = *m_flags[FlagEnd];
@@ -663,7 +663,7 @@
 	return false;
 }
 
-void Road::log_general_info(const Editor_Game_Base & egbase)
+void Road::log_general_info(const EditorGameBase & egbase)
 {
 	PlayerImmovable::log_general_info(egbase);
 	molog("m_busyness: %i\n", m_busyness);

=== modified file 'src/economy/road.h'
--- src/economy/road.h	2014-07-28 16:59:54 +0000
+++ src/economy/road.h	2014-09-18 15:54:00 +0000
@@ -58,8 +58,8 @@
  * road.
  */
 struct Road : public PlayerImmovable {
-	friend class Map_Roaddata_Data_Packet; // For saving
-	friend class Map_Road_Data_Packet; // For init()
+	friend class MapRoaddataPacket; // For saving
+	friend class MapRoadPacket; // For init()
 
 	const RoadDescr& descr() const;
 
@@ -82,7 +82,7 @@
 	virtual ~Road();
 
 	static Road & create
-		(Editor_Game_Base &,
+		(EditorGameBase &,
 		 Flag & start, Flag & end, const Path &);
 
 	Flag & get_flag(FlagId const flag) const {return *m_flags[flag];}
@@ -90,7 +90,7 @@
 	uint8_t get_roadtype() const {return m_type;}
 	int32_t  get_size    () const override;
 	bool get_passable() const override;
-	PositionList get_positions(const Editor_Game_Base &) const override;
+	PositionList get_positions(const EditorGameBase &) const override;
 
 	Flag & base_flag() override;
 
@@ -108,25 +108,25 @@
 	void remove_worker(Worker &) override;
 	void assign_carrier(Carrier &, uint8_t);
 
-	void log_general_info(const Editor_Game_Base &) override;
+	void log_general_info(const EditorGameBase &) override;
 
 protected:
-	void init(Editor_Game_Base &) override;
-	void cleanup(Editor_Game_Base &) override;
+	void init(EditorGameBase &) override;
+	void cleanup(EditorGameBase &) override;
 
-	void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
+	void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
 
 private:
-	void _set_path(Editor_Game_Base &, const Path &);
-
-	void _mark_map(Editor_Game_Base &);
-	void _unmark_map(Editor_Game_Base &);
-
-	void _link_into_flags(Editor_Game_Base &);
+	void _set_path(EditorGameBase &, const Path &);
+
+	void _mark_map(EditorGameBase &);
+	void _unmark_map(EditorGameBase &);
+
+	void _link_into_flags(EditorGameBase &);
 
 	void _request_carrier(CarrierSlot &);
 	static void _request_carrier_callback
-		(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
+		(Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
 
 private:
 
@@ -147,7 +147,7 @@
 	Path       m_path;       ///< path goes from start to end
 	uint32_t   m_idle_index; ///< index into path where carriers should idle
 
-	typedef std::vector<CarrierSlot> SlotVector;
+	using SlotVector = std::vector<CarrierSlot>;
 	SlotVector m_carrier_slots;
 };
 

=== modified file 'src/economy/route.cc'
--- src/economy/route.cc	2014-07-28 14:17:07 +0000
+++ src/economy/route.cc	2014-09-18 15:54:00 +0000
@@ -23,8 +23,8 @@
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/editor_game_base.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 /*
 ==============================================================================
@@ -54,7 +54,7 @@
  * Every route has at least one flag.
 */
 Flag & Route::get_flag
-	(Editor_Game_Base & egbase, std::vector<Flag *>::size_type const idx)
+	(EditorGameBase & egbase, std::vector<Flag *>::size_type const idx)
 {
 	assert(idx < m_route.size());
 	return *m_route[idx].get(egbase);
@@ -102,12 +102,12 @@
  * load_pointers phase of loading: This is responsible for filling
  * in the \ref Flag pointers. Must be called after \ref load.
  */
-void Route::load_pointers(const LoadData & data, MapMapObjectLoader & mol) {
+void Route::load_pointers(const LoadData & data, MapObjectLoader & mol) {
 	for (uint32_t i = 0; i < data.flags.size(); ++i) {
 		uint32_t const flag_serial = data.flags.size();
 		try {
 			m_route.push_back(&mol.get<Flag>(flag_serial));
-		} catch (const _wexception & e) {
+		} catch (const WException & e) {
 			throw wexception("Route flag #%u (%u): %s", i, flag_serial, e.what());
 		}
 	}
@@ -118,12 +118,12 @@
  * Save the route to the given file.
  */
 void Route::save
-	(FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
+	(FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
 {
 	fw.Signed32(get_totalcost());
 	fw.Unsigned16(m_route.size());
 	for
-		(std::vector<Object_Ptr>::size_type idx = 0;
+		(std::vector<ObjectPointer>::size_type idx = 0;
 		 idx < m_route.size();
 		 ++idx)
 	{

=== modified file 'src/economy/route.h'
--- src/economy/route.h	2014-07-28 14:17:07 +0000
+++ src/economy/route.h	2014-09-18 15:54:00 +0000
@@ -29,9 +29,9 @@
 namespace Widelands {
 
 struct Flag;
-class Editor_Game_Base;
-struct MapMapObjectSaver;
-class MapMapObjectLoader;
+class EditorGameBase;
+struct MapObjectSaver;
+class MapObjectLoader;
 struct RoutingNode;
 
 /**
@@ -48,7 +48,7 @@
 
 	int32_t get_totalcost() const {return m_totalcost;}
 	int32_t get_nrsteps() const {return m_route.size() - 1;}
-	Flag & get_flag(Editor_Game_Base &, std::vector<Flag *>::size_type);
+	Flag & get_flag(EditorGameBase &, std::vector<Flag *>::size_type);
 
 	void starttrim(int32_t count);
 	void truncate(int32_t count);
@@ -58,8 +58,8 @@
 	};
 
 	void load(LoadData &, FileRead &);
-	void load_pointers(const LoadData &, MapMapObjectLoader &);
-	void save(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &);
+	void load_pointers(const LoadData &, MapObjectLoader &);
+	void save(FileWrite &, EditorGameBase &, MapObjectSaver &);
 
 	void insert_as_first(RoutingNode * node) override;
 

=== modified file 'src/economy/routeastar.h'
--- src/economy/routeastar.h	2014-07-24 18:22:30 +0000
+++ src/economy/routeastar.h	2014-09-18 15:54:00 +0000
@@ -75,7 +75,7 @@
  */
 template<typename Est_>
 struct RouteAStar : BaseRouteAStar {
-	typedef Est_ Estimator;
+	using Estimator = Est_;
 
 	RouteAStar(Router & router, WareWorker type, const Estimator & est = Estimator());
 

=== modified file 'src/economy/router.h'
--- src/economy/router.h	2014-07-16 08:23:42 +0000
+++ src/economy/router.h	2014-09-18 15:54:00 +0000
@@ -36,7 +36,7 @@
  * The functionality was split from Economy
  */
 struct Router {
-	typedef boost::function<void ()> ResetCycleFn;
+	using ResetCycleFn = boost::function<void ()>;
 
 	Router(const ResetCycleFn & reset);
 

=== modified file 'src/economy/routing_node.h'
--- src/economy/routing_node.h	2014-07-05 16:41:51 +0000
+++ src/economy/routing_node.h	2014-09-18 15:54:00 +0000
@@ -50,7 +50,7 @@
 	RoutingNode * m_nb;
 	int32_t m_cost; /// Cost to get from me to the neighbour (Cost for road)
 };
-typedef std::vector<RoutingNodeNeighbour> RoutingNodeNeighbours;
+using RoutingNodeNeighbours = std::vector<RoutingNodeNeighbour>;
 
 /**
  * A routing node is a field with a cost attached to it
@@ -65,10 +65,10 @@
 			return a.cost() < b.cost();
 		}
 	};
-	typedef cookie_priority_queue<RoutingNode, LessCost> Queue;
+	using Queue = CookiePriorityQueue<RoutingNode, LessCost>;
 
 	uint32_t      mpf_cycle;
-	Queue::cookie mpf_cookie;
+	Queue::Cookie mpf_cookie;
 	int32_t       mpf_realcost; ///< real cost of getting to this flag
 	RoutingNode * mpf_backlink; ///< flag where we came from
 	int32_t       mpf_estimate; ///< estimate of cost to destination
@@ -83,7 +83,7 @@
 	}
 
 	int32_t cost() const {return mpf_realcost + mpf_estimate;}
-	Queue::cookie & cookie() {return mpf_cookie;}
+	Queue::Cookie & cookie() {return mpf_cookie;}
 
 	virtual Flag & base_flag() = 0;
 	virtual void get_neighbours(WareWorker type, RoutingNodeNeighbours &) = 0;

=== modified file 'src/economy/shippingitem.cc'
--- src/economy/shippingitem.cc	2014-07-28 14:23:03 +0000
+++ src/economy/shippingitem.cc	2014-09-18 15:54:00 +0000
@@ -25,8 +25,8 @@
 #include "io/filewrite.h"
 #include "logic/game_data_error.h"
 #include "logic/worker.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
@@ -40,7 +40,7 @@
 {
 }
 
-void ShippingItem::get(Editor_Game_Base& game, WareInstance** ware, Worker** worker) const {
+void ShippingItem::get(EditorGameBase& game, WareInstance** ware, Worker** worker) const {
 	if (ware) {
 		*ware = nullptr;
 	}
@@ -154,7 +154,7 @@
 /**
  * Remove the underlying item directly. This is used when ships are removed.
  */
-void ShippingItem::remove(Editor_Game_Base & egbase)
+void ShippingItem::remove(EditorGameBase & egbase)
 {
 	if (MapObject * obj = m_object.get(egbase)) {
 		obj->remove(egbase);
@@ -171,10 +171,10 @@
 	if (1 <= version && version <= SHIPPINGITEM_SAVEGAME_VERSION) {
 		m_serial = fr.Unsigned32();
 	} else
-		throw game_data_error("unknown ShippingItem version %u", version);
+		throw GameDataError("unknown ShippingItem version %u", version);
 }
 
-ShippingItem ShippingItem::Loader::get(MapMapObjectLoader & mol)
+ShippingItem ShippingItem::Loader::get(MapObjectLoader & mol)
 {
 	ShippingItem it;
 	if (m_serial != 0)
@@ -182,7 +182,7 @@
 	return it;
 }
 
-void ShippingItem::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
+void ShippingItem::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
 {
 	fw.Unsigned8(SHIPPINGITEM_SAVEGAME_VERSION);
 	fw.Unsigned32(mos.get_object_file_index_or_zero(m_object.get(egbase)));

=== modified file 'src/economy/shippingitem.h'
--- src/economy/shippingitem.h	2014-07-28 14:17:07 +0000
+++ src/economy/shippingitem.h	2014-09-18 15:54:00 +0000
@@ -30,8 +30,8 @@
 
 class Economy;
 class Game;
-class MapMapObjectLoader;
-struct MapMapObjectSaver;
+class MapObjectLoader;
+struct MapObjectSaver;
 class MapObject;
 class PortDock;
 class WareInstance;
@@ -49,23 +49,23 @@
 	// Unboxes the item that is shipped which might be either a ware or a
 	// worker. It is safe to pass nullptr for 'ware' or 'worker' in case you are
 	// only interested in the ware if it is the one or the other.
-	void get(Editor_Game_Base& game, WareInstance** ware, Worker** worker) const;
+	void get(EditorGameBase& game, WareInstance** ware, Worker** worker) const;
 
 	void set_economy(Game &, Economy * e);
 	PortDock * get_destination(Game &);
 	void schedule_update(Game &, int32_t delay);
 
-	void remove(Editor_Game_Base &);
+	void remove(EditorGameBase &);
 
 	struct Loader {
 		void load(FileRead & fr);
-		ShippingItem get(MapMapObjectLoader & mol);
+		ShippingItem get(MapObjectLoader & mol);
 
 	private:
 		uint32_t m_serial;
 	};
 
-	void save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw);
+	void save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw);
 
 private:
 	friend class PortDock;
@@ -80,7 +80,7 @@
 	// Updates m_destination_dock.
 	void update_destination(Game &, PortDock &);
 
-	Object_Ptr m_object;
+	ObjectPointer m_object;
 	OPtr<PortDock> m_destination_dock;
 };
 

=== modified file 'src/economy/supply.h'
--- src/economy/supply.h	2014-07-05 16:41:51 +0000
+++ src/economy/supply.h	2014-09-18 15:54:00 +0000
@@ -69,7 +69,7 @@
 	 *
 	 * \note This is only valid if \ref has_storage returns \c false.
 	 */
-	virtual void get_ware_type(WareWorker & type, Ware_Index & ware) const = 0;
+	virtual void get_ware_type(WareWorker & type, WareIndex & ware) const = 0;
 
 	/**
 	 * Send this to the given warehouse.

=== modified file 'src/economy/supply_list.h'
--- src/economy/supply_list.h	2014-07-05 16:41:51 +0000
+++ src/economy/supply_list.h	2014-09-18 15:54:00 +0000
@@ -43,7 +43,7 @@
 	bool have_supplies(Game & game, const Request &);
 
 private:
-	typedef std::vector<Supply *> Supplies;
+	using Supplies = std::vector<Supply *>;
 	Supplies m_supplies;
 };
 

=== modified file 'src/economy/test/test_road.cc'
--- src/economy/test/test_road.cc	2014-07-26 10:43:23 +0000
+++ src/economy/test/test_road.cc	2014-09-18 15:54:00 +0000
@@ -38,7 +38,7 @@
 /* Helper classes */
 /******************/
 struct TestingFlag : public Flag {
-	TestingFlag(Editor_Game_Base &, Coords const c) : Flag() {
+	TestingFlag(EditorGameBase &, Coords const c) : Flag() {
 		set_flag_position(c);
 	}
 
@@ -77,11 +77,11 @@
 	~SimpleRoadTestsFixture() {
 		delete start;
 		delete end;
-		// Map is deleted by Editor_Game_Base
+		// Map is deleted by EditorGameBase
 	}
 
 	TestingMap * map;
-	Editor_Game_Base g;
+	EditorGameBase g;
 	Road r;
 	Path path;
 	TestingFlag * start;

=== modified file 'src/economy/test/test_routing.cc'
--- src/economy/test/test_routing.cc	2014-07-26 10:57:26 +0000
+++ src/economy/test/test_routing.cc	2014-09-18 15:54:00 +0000
@@ -67,7 +67,7 @@
 	bool all_members_zeroed();
 
 private:
-	typedef std::vector<TestingRoutingNode *> Neigbours;
+	using Neigbours = std::vector<TestingRoutingNode *>;
 
 	Neigbours _neighbours;
 	int32_t _waitcost;
@@ -100,7 +100,7 @@
 };
 class TestingRoute : public IRoute {
 public:
-	typedef std::vector<RoutingNode *> Nodes;
+	using Nodes = std::vector<RoutingNode *>;
 
 	void init(int32_t) override {
 		nodes.clear();
@@ -178,14 +178,14 @@
 	BOOST_CHECK_EQUAL(d0.get_position().x, 0);
 	BOOST_CHECK_EQUAL(d1.get_position().x, 15);
 }
-struct TestingNode_DefaultNodes_Fixture {
-	TestingNode_DefaultNodes_Fixture() {
+struct TestingNodeDefaultNodesFixture {
+	TestingNodeDefaultNodesFixture() {
 		d0 = new TestingRoutingNode();
 		d1 = new TestingRoutingNode(1, Coords(15, 0));
 		nodes.push_back(d0);
 		nodes.push_back(d1);
 	}
-	~TestingNode_DefaultNodes_Fixture() {
+	~TestingNodeDefaultNodesFixture() {
 		while (!nodes.empty()) {
 			TestingRoutingNode * n = nodes.back();
 			delete n;
@@ -197,14 +197,14 @@
 	TestingRoutingNode * d1;
 };
 BOOST_FIXTURE_TEST_CASE
-	(testingnode_neighbour_attaching, TestingNode_DefaultNodes_Fixture)
+	(testingnode_neighbour_attaching, TestingNodeDefaultNodesFixture)
 {
 	d0->add_neighbour(d1);
 
 	BOOST_CHECK_EQUAL(d0->get_neighbour(0), d1);
 }
 BOOST_FIXTURE_TEST_CASE
-	(testingnode_illegalneighbour_access, TestingNode_DefaultNodes_Fixture)
+	(testingnode_illegalneighbour_access, TestingNodeDefaultNodesFixture)
 {
 	try {
 		d0->get_neighbour(0);
@@ -391,7 +391,7 @@
 }
 
 struct ComplexRouterFixture {
-	typedef std::vector<RoutingNode *> Nodes;
+	using Nodes = std::vector<RoutingNode *>;
 
 	ComplexRouterFixture() : r(boost::bind(&ComplexRouterFixture::reset, this)) {
 		d0 = new TestingRoutingNode();

=== modified file 'src/economy/transfer.cc'
--- src/economy/transfer.cc	2014-07-28 14:17:07 +0000
+++ src/economy/transfer.cc	2014-09-18 15:54:00 +0000
@@ -33,8 +33,8 @@
 #include "logic/player.h"
 #include "logic/warehouse.h"
 #include "logic/worker.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
@@ -324,13 +324,13 @@
 }
 
 void Transfer::read_pointers
-	(MapMapObjectLoader & mol, const Widelands::Transfer::ReadData & rd)
+	(MapObjectLoader & mol, const Widelands::Transfer::ReadData & rd)
 {
 	if (rd.destination)
 		m_destination = &mol.get<PlayerImmovable>(rd.destination);
 }
 
-void Transfer::write(MapMapObjectSaver & mos, FileWrite & fw)
+void Transfer::write(MapObjectSaver & mos, FileWrite & fw)
 {
 	fw.Unsigned8(TRANSFER_SAVEGAME_VERSION);
 	fw.Unsigned32(mos.get_object_file_index_or_zero(m_destination.get(m_game)));

=== modified file 'src/economy/transfer.h'
--- src/economy/transfer.h	2014-07-28 14:17:07 +0000
+++ src/economy/transfer.h	2014-09-18 15:54:00 +0000
@@ -27,8 +27,8 @@
 struct PlayerImmovable;
 class Request;
 class WareInstance;
-class MapMapObjectLoader;
-struct MapMapObjectSaver;
+class MapObjectLoader;
+struct MapObjectSaver;
 class Worker;
 
 /**
@@ -70,8 +70,8 @@
 	};
 
 	void read(FileRead & fr, ReadData & rd);
-	void read_pointers(MapMapObjectLoader & mol, const ReadData & rd);
-	void write(MapMapObjectSaver & mos, FileWrite & fw);
+	void read_pointers(MapObjectLoader & mol, const ReadData & rd);
+	void write(MapObjectSaver & mos, FileWrite & fw);
 
 private:
 	void tlog(char const * fmt, ...) PRINTF_FORMAT(2, 3);

=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc	2014-07-28 14:28:02 +0000
+++ src/economy/ware_instance.cc	2014-09-18 15:54:00 +0000
@@ -36,8 +36,8 @@
 #include "logic/tribe.h"
 #include "logic/warehouse.h"
 #include "logic/worker.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
@@ -56,7 +56,7 @@
 	PlayerImmovable * get_position(Game &) override;
 	bool is_active() const override;
 	bool has_storage() const override;
-	void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
+	void get_ware_type(WareWorker & type, WareIndex & ware) const override;
 	void send_to_storage(Game &, Warehouse * wh) override;
 
 	uint32_t nr_supplies(const Game &, const Request &) const override;
@@ -131,7 +131,7 @@
 	return m_ware.is_moving();
 }
 
-void IdleWareSupply::get_ware_type(WareWorker & type, Ware_Index & ware) const
+void IdleWareSupply::get_ware_type(WareWorker & type, WareIndex & ware) const
 {
 	type = wwWARE;
 	ware = m_ware.descr_index();
@@ -183,7 +183,7 @@
 /*                     Ware Instance Implementation                      */
 /*************************************************************************/
 WareInstance::WareInstance
-	(Ware_Index const i, const WareDescr * const ware_descr)
+	(WareIndex const i, const WareDescr * const ware_descr)
 :
 MapObject   (ware_descr),
 m_economy    (nullptr),
@@ -200,12 +200,12 @@
 	}
 }
 
-void WareInstance::init(Editor_Game_Base & egbase)
+void WareInstance::init(EditorGameBase & egbase)
 {
 	MapObject::init(egbase);
 }
 
-void WareInstance::cleanup(Editor_Game_Base & egbase)
+void WareInstance::cleanup(EditorGameBase & egbase)
 {
 	// Unlink from our current location, if necessary
 	if (upcast(Flag, flag, m_location.get(egbase)))
@@ -244,7 +244,7 @@
  * Once you've assigned a ware to its new location, you usually have to call
  * \ref update() as well.
 */
-void WareInstance::set_location(Editor_Game_Base & egbase, MapObject * const location)
+void WareInstance::set_location(EditorGameBase & egbase, MapObject * const location)
 {
 	MapObject * const oldlocation = m_location.get(egbase);
 
@@ -527,7 +527,7 @@
 		dynamic_cast<PlayerImmovable *>(m_transfer_nextstep.get(game)) : nullptr;
 }
 
-void WareInstance::log_general_info(const Editor_Game_Base & egbase)
+void WareInstance::log_general_info(const EditorGameBase & egbase)
 {
 	MapObject::log_general_info(egbase);
 
@@ -561,7 +561,7 @@
 	m_transfer_nextstep = fr.Unsigned32();
 	if (fr.Unsigned8()) {
 		ware.m_transfer =
-			new Transfer(ref_cast<Game, Editor_Game_Base>(egbase()), ware);
+			new Transfer(ref_cast<Game, EditorGameBase>(egbase()), ware);
 		ware.m_transfer->read(fr, m_transfer);
 	}
 }
@@ -596,7 +596,7 @@
 
 
 void WareInstance::save
-	(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
+	(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
 {
 	fw.Unsigned8(HeaderWareInstance);
 	fw.Unsigned8(WAREINSTANCE_SAVEGAME_VERSION);
@@ -617,7 +617,7 @@
 }
 
 MapObject::Loader * WareInstance::load
-	(Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
+	(EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
 {
 	try {
 		uint8_t version = fr.Unsigned8();
@@ -630,11 +630,11 @@
 
 		egbase.manually_load_tribe(tribename);
 
-		const Tribe_Descr * tribe = egbase.get_tribe(tribename);
+		const TribeDescr * tribe = egbase.get_tribe(tribename);
 		if (!tribe)
 			throw wexception("unknown tribe '%s'", tribename.c_str());
 
-		Ware_Index wareindex = tribe->ware_index(warename);
+		WareIndex wareindex = tribe->ware_index(warename);
 		const WareDescr * descr = tribe->get_ware_descr(wareindex);
 
 		std::unique_ptr<Loader> loader(new Loader);

=== modified file 'src/economy/ware_instance.h'
--- src/economy/ware_instance.h	2014-07-28 14:17:07 +0000
+++ src/economy/ware_instance.h	2014-09-18 15:54:00 +0000
@@ -29,7 +29,7 @@
 
 class Building;
 class Economy;
-class Editor_Game_Base;
+class EditorGameBase;
 class Game;
 struct IdleWareSupply;
 class MapObject;
@@ -53,30 +53,30 @@
  *     for seafaring
  */
 class WareInstance : public MapObject {
-	friend struct Map_Waredata_Data_Packet;
+	friend struct MapWaredataPacket;
 
 	MO_DESCR(WareDescr)
 
 public:
-	WareInstance(Ware_Index, const WareDescr* const);
+	WareInstance(WareIndex, const WareDescr* const);
 	~WareInstance();
 
-	MapObject* get_location(Editor_Game_Base& egbase) {
+	MapObject* get_location(EditorGameBase& egbase) {
 		return m_location.get(egbase);
 	}
 	Economy* get_economy() const {
 		return m_economy;
 	}
-	Ware_Index descr_index() const {
+	WareIndex descr_index() const {
 		return m_descr_index;
 	}
 
-	void init(Editor_Game_Base&) override;
-	void cleanup(Editor_Game_Base&) override;
+	void init(EditorGameBase&) override;
+	void cleanup(EditorGameBase&) override;
 	void act(Game&, uint32_t data) override;
 	void update(Game&);
 
-	void set_location(Editor_Game_Base&, MapObject* loc);
+	void set_location(EditorGameBase&, MapObject* loc);
 	void set_economy(Economy*);
 
 	void enter_building(Game&, Building& building);
@@ -92,16 +92,16 @@
 		return m_transfer;
 	}
 
-	void log_general_info(const Editor_Game_Base& egbase) override;
+	void log_general_info(const EditorGameBase& egbase) override;
 
 private:
-	Object_Ptr m_location;
+	ObjectPointer m_location;
 	Economy* m_economy;
-	Ware_Index m_descr_index;
+	WareIndex m_descr_index;
 
 	IdleWareSupply* m_supply;
 	Transfer* m_transfer;
-	Object_Ptr m_transfer_nextstep;  ///< cached PlayerImmovable, can be 0
+	ObjectPointer m_transfer_nextstep;  ///< cached PlayerImmovable, can be 0
 
 	// loading and saving stuff
 protected:
@@ -123,8 +123,8 @@
 		return true;
 	}
 
-	void save(Editor_Game_Base&, MapMapObjectSaver&, FileWrite&) override;
-	static MapObject::Loader* load(Editor_Game_Base&, MapMapObjectLoader&, FileRead&);
+	void save(EditorGameBase&, MapObjectSaver&, FileWrite&) override;
+	static MapObject::Loader* load(EditorGameBase&, MapObjectLoader&, FileRead&);
 };
 }
 

=== modified file 'src/economy/warehousesupply.h'
--- src/economy/warehousesupply.h	2014-07-26 10:43:23 +0000
+++ src/economy/warehousesupply.h	2014-09-18 15:54:00 +0000
@@ -36,27 +36,27 @@
 
 	void set_economy(Economy *);
 
-	void set_nrworkers(Ware_Index);
-	void set_nrwares  (Ware_Index);
+	void set_nrworkers(WareIndex);
+	void set_nrwares  (WareIndex);
 
 	const WareList & get_wares  () const {return m_wares;}
 	const WareList & get_workers() const {return m_workers;}
-	uint32_t stock_wares  (Ware_Index const i) const {
+	uint32_t stock_wares  (WareIndex const i) const {
 		return m_wares  .stock(i);
 	}
-	uint32_t stock_workers(Ware_Index const i) const {
+	uint32_t stock_workers(WareIndex const i) const {
 		return m_workers.stock(i);
 	}
-	void add_wares     (Ware_Index, uint32_t count);
-	void remove_wares  (Ware_Index, uint32_t count);
-	void add_workers   (Ware_Index, uint32_t count);
-	void remove_workers(Ware_Index, uint32_t count);
+	void add_wares     (WareIndex, uint32_t count);
+	void remove_wares  (WareIndex, uint32_t count);
+	void add_workers   (WareIndex, uint32_t count);
+	void remove_workers(WareIndex, uint32_t count);
 
 	// Supply implementation
 	PlayerImmovable * get_position(Game &) override;
 	bool is_active() const override;
 	bool has_storage() const override;
-	void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
+	void get_ware_type(WareWorker & type, WareIndex & ware) const override;
 
 	void send_to_storage(Game &, Warehouse * wh) override;
 	uint32_t nr_supplies(const Game &, const Request &) const override;

=== modified file 'src/economy/wares_queue.cc'
--- src/economy/wares_queue.cc	2014-07-28 14:17:07 +0000
+++ src/economy/wares_queue.cc	2014-09-18 15:54:00 +0000
@@ -28,8 +28,8 @@
 #include "logic/game.h"
 #include "logic/player.h"
 #include "logic/tribe.h"
-#include "map_io/widelands_map_map_object_loader.h"
-#include "map_io/widelands_map_map_object_saver.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
 
 namespace Widelands {
 
@@ -38,7 +38,7 @@
 */
 WaresQueue::WaresQueue
 	(PlayerImmovable &       _owner,
-	 Ware_Index        const _ware,
+	 WareIndex        const _ware,
 	 uint8_t           const _max_size)
 	:
 	m_owner           (_owner),
@@ -110,7 +110,7 @@
 /**
  * Set the callback function that is called when an item has arrived.
 */
-void WaresQueue::set_callback(callback_t * const fn, void * const data)
+void WaresQueue::set_callback(CallbackFn * const fn, void * const data)
 {
 	m_callback_fn = fn;
 	m_callback_data = data;
@@ -122,7 +122,7 @@
 void WaresQueue::request_callback
 	(Game            &       game,
 	 Request         &,
-	 Ware_Index        const ware,
+	 WareIndex        const ware,
 #ifndef NDEBUG
 	 Worker          * const w,
 #else
@@ -235,7 +235,7 @@
  * Read and write
  */
 #define WARES_QUEUE_DATA_PACKET_VERSION 2
-void WaresQueue::Write(FileWrite & fw, Game & game, MapMapObjectSaver & mos)
+void WaresQueue::Write(FileWrite & fw, Game & game, MapObjectSaver & mos)
 {
 	fw.Unsigned16(WARES_QUEUE_DATA_PACKET_VERSION);
 
@@ -254,7 +254,7 @@
 }
 
 
-void WaresQueue::Read(FileRead & fr, Game & game, MapMapObjectLoader & mol)
+void WaresQueue::Read(FileRead & fr, Game & game, MapObjectLoader & mol)
 {
 	uint16_t const packet_version = fr.Unsigned16();
 	try {
@@ -283,10 +283,10 @@
 			if (m_owner.get_economy())
 				add_to_economy(*m_owner.get_economy());
 		} else
-			throw game_data_error
+			throw GameDataError
 				("unknown/unhandled version %u", packet_version);
-	} catch (const game_data_error & e) {
-		throw game_data_error("waresqueue: %s", e.what());
+	} catch (const GameDataError & e) {
+		throw GameDataError("waresqueue: %s", e.what());
 	}
 }
 

=== modified file 'src/economy/wares_queue.h'
--- src/economy/wares_queue.h	2014-07-28 14:17:07 +0000
+++ src/economy/wares_queue.h	2014-09-18 15:54:00 +0000
@@ -26,10 +26,10 @@
 namespace Widelands {
 
 class Economy;
-class Editor_Game_Base;
+class EditorGameBase;
 class Game;
-class MapMapObjectLoader;
-struct MapMapObjectSaver;
+class MapObjectLoader;
+struct MapObjectSaver;
 class Player;
 class Request;
 class Worker;
@@ -39,23 +39,23 @@
  */
 class WaresQueue {
 public:
-	typedef void (callback_t)
-		(Game &, WaresQueue *, Ware_Index ware, void * data);
+	using CallbackFn = void
+		(Game &, WaresQueue *, WareIndex ware, void * data);
 
-	WaresQueue(PlayerImmovable &, Ware_Index, uint8_t size);
+	WaresQueue(PlayerImmovable &, WareIndex, uint8_t size);
 
 #ifndef NDEBUG
 	~WaresQueue() {assert(m_ware == INVALID_INDEX);}
 #endif
 
-	Ware_Index get_ware()   const          {return m_ware;}
+	WareIndex get_ware()    const {return m_ware;}
 	uint32_t get_max_fill() const {return m_max_fill;}
 	uint32_t get_max_size() const {return m_max_size;}
 	uint32_t get_filled()   const {return m_filled;}
 
 	void cleanup();
 
-	void set_callback(callback_t *, void * data);
+	void set_callback(CallbackFn *, void * data);
 
 	void remove_from_economy(Economy &);
 	void add_to_economy(Economy &);
@@ -67,16 +67,16 @@
 
 	Player & owner() const {return m_owner.owner();}
 
-	void Read (FileRead  &, Game &, MapMapObjectLoader &);
-	void Write(FileWrite &, Game &, MapMapObjectSaver  &);
+	void Read (FileRead  &, Game &, MapObjectLoader &);
+	void Write(FileWrite &, Game &, MapObjectSaver  &);
 
 private:
 	static void request_callback
-		(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
+		(Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
 	void update();
 
 	PlayerImmovable & m_owner;
-	Ware_Index        m_ware;    ///< ware ID
+	WareIndex         m_ware;    ///< ware ID
 	uint32_t m_max_size;         ///< nr of items that fit into the queue maximum
 	uint32_t m_max_fill;         ///< nr of wares that should be ideally in this queue
 	uint32_t m_filled;           ///< nr of items that are currently in the queue
@@ -86,7 +86,7 @@
 
 	Request         * m_request; ///< currently pending request
 
-	callback_t      * m_callback_fn;
+	CallbackFn      * m_callback_fn;
 	void            * m_callback_data;
 };
 

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2014-07-25 22:17:48 +0000
+++ src/editor/editorinteractive.cc	2014-09-18 15:54:00 +0000
@@ -58,8 +58,8 @@
 using Widelands::Building;
 
 // Load all tribes from disk.
-void load_all_tribes(Widelands::Editor_Game_Base* egbase, UI::ProgressWindow* loader_ui) {
-	for (const std::string& tribename : Widelands::Tribe_Descr::get_all_tribenames()) {
+void load_all_tribes(Widelands::EditorGameBase* egbase, UI::ProgressWindow* loader_ui) {
+	for (const std::string& tribename : Widelands::TribeDescr::get_all_tribenames()) {
 		ScopedTimer timer((boost::format("Loading %s took %%ums.") % tribename).str());
 		loader_ui->stepf(_("Loading tribe: %s"), tribename.c_str());
 		egbase->manually_load_tribe(tribename);
@@ -68,8 +68,8 @@
 
 }  // namespace
 
-Editor_Interactive::Editor_Interactive(Widelands::Editor_Game_Base & e) :
-	Interactive_Base(e, g_options.pull_section("global")),
+EditorInteractive::EditorInteractive(Widelands::EditorGameBase & e) :
+	InteractiveBase(e, g_options.pull_section("global")),
 	m_need_save(false),
 	m_realtime(WLApplication::get()->get_time()),
 	m_left_mouse_button_is_down(false),
@@ -106,16 +106,16 @@
 	(INIT_BUTTON
 	 ("editor_redo", "redo", _("Redo")))
 {
-	m_toggle_main_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_mainmenu, this));
-	m_toggle_tool_menu.sigclicked.connect(boost::bind(&Editor_Interactive::tool_menu_btn, this));
-	m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toolsize_menu_btn, this));
-	m_toggle_minimap.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_minimap, this));
-	m_toggle_buildhelp.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_buildhelp, this));
-	m_toggle_player_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_playermenu, this));
+	m_toggle_main_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_mainmenu, this));
+	m_toggle_tool_menu.sigclicked.connect(boost::bind(&EditorInteractive::tool_menu_btn, this));
+	m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&EditorInteractive::toolsize_menu_btn, this));
+	m_toggle_minimap.sigclicked.connect(boost::bind(&EditorInteractive::toggle_minimap, this));
+	m_toggle_buildhelp.sigclicked.connect(boost::bind(&EditorInteractive::toggle_buildhelp, this));
+	m_toggle_player_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_playermenu, this));
 	m_undo.sigclicked.connect(
-	   boost::bind(&Editor_History::undo_action, &m_history, boost::cref(egbase().world())));
+		boost::bind(&EditorHistory::undo_action, &m_history, boost::cref(egbase().world())));
 	m_redo.sigclicked.connect(
-	   boost::bind(&Editor_History::redo_action, &m_history, boost::cref(egbase().world())));
+		boost::bind(&EditorHistory::redo_action, &m_history, boost::cref(egbase().world())));
 
 	m_toolbar.set_layout_toplevel(true);
 	m_toolbar.add(&m_toggle_main_menu,       UI::Box::AlignLeft);
@@ -132,19 +132,19 @@
 	m_redo.set_enabled(false);
 
 #ifndef NDEBUG
-	set_display_flag(Interactive_Base::dfDebug, true);
+	set_display_flag(InteractiveBase::dfDebug, true);
 #else
-	set_display_flag(Interactive_Base::dfDebug, false);
+	set_display_flag(InteractiveBase::dfDebug, false);
 #endif
 
-	fieldclicked.connect(boost::bind(&Editor_Interactive::map_clicked, this, false));
+	fieldclicked.connect(boost::bind(&EditorInteractive::map_clicked, this, false));
 }
 
-void Editor_Interactive::register_overlays() {
+void EditorInteractive::register_overlays() {
 	Widelands::Map & map = egbase().map();
 
 	//  Starting locations
-	Widelands::Player_Number const nr_players = map.get_nrplayers();
+	Widelands::PlayerNumber const nr_players = map.get_nrplayers();
 	assert(nr_players <= 99); //  2 decimal digits
 	char fname[] = "pics/editor_player_00_starting_pos.png";
 	iterate_player_numbers(p, nr_players) {
@@ -174,7 +174,7 @@
 }
 
 
-void Editor_Interactive::load(const std::string & filename) {
+void EditorInteractive::load(const std::string & filename) {
 	assert(filename.size());
 
 	Widelands::Map & map = egbase().map();
@@ -184,9 +184,9 @@
 	egbase().cleanup_for_load();
 	m_history.reset();
 
-	std::unique_ptr<Widelands::Map_Loader> ml(map.get_correct_loader(filename));
+	std::unique_ptr<Widelands::MapLoader> ml(map.get_correct_loader(filename));
 	if (!ml.get())
-		throw warning
+		throw WLWarning
 			(_("Unsupported format"),
 			 _("Widelands could not load the file \"%s\". The file format seems to be incompatible."),
 			 filename.c_str());
@@ -219,7 +219,7 @@
 
 
 /// Called just before the editor starts, after postload, init and gfxload.
-void Editor_Interactive::start() {
+void EditorInteractive::start() {
 	// Run the editor initialization script, if any
 	try {
 		egbase().lua().run_script("map:scripting/editor_init.lua");
@@ -235,8 +235,8 @@
  *
  * Advance the timecounter and animate textures.
  */
-void Editor_Interactive::think() {
-	Interactive_Base::think();
+void EditorInteractive::think() {
+	InteractiveBase::think();
 
 	int32_t lasttime = m_realtime;
 	int32_t frametime;
@@ -251,7 +251,7 @@
 
 
 
-void Editor_Interactive::exit() {
+void EditorInteractive::exit() {
 	if (m_need_save) {
 		UI::WLMessageBox mmb
 		(this,
@@ -264,14 +264,14 @@
 	end_modal(0);
 }
 
-void Editor_Interactive::toggle_mainmenu() {
+void EditorInteractive::toggle_mainmenu() {
 	if (m_mainmenu.window)
 		delete m_mainmenu.window;
 	else
-		new Editor_Main_Menu(*this, m_mainmenu);
+		new EditorMainMenu(*this, m_mainmenu);
 }
 
-void Editor_Interactive::map_clicked(bool should_draw) {
+void EditorInteractive::map_clicked(bool should_draw) {
 	m_history.do_action
 		(tools.current(),
 		 tools.use_tool, egbase().map(), egbase().world(),
@@ -280,72 +280,72 @@
 	set_need_save(true);
 }
 
-bool Editor_Interactive::handle_mouserelease(uint8_t btn, int32_t x, int32_t y) {
+bool EditorInteractive::handle_mouserelease(uint8_t btn, int32_t x, int32_t y) {
 	if (btn == SDL_BUTTON_LEFT) {
 		m_left_mouse_button_is_down = false;
 	}
-	return Interactive_Base::handle_mouserelease(btn, x, y);
+	return InteractiveBase::handle_mouserelease(btn, x, y);
 }
 
-bool Editor_Interactive::handle_mousepress(uint8_t btn, int32_t x, int32_t y) {
+bool EditorInteractive::handle_mousepress(uint8_t btn, int32_t x, int32_t y) {
 	if (btn == SDL_BUTTON_LEFT) {
 		m_left_mouse_button_is_down = true;
 	}
-	return Interactive_Base::handle_mousepress(btn, x, y);
+	return InteractiveBase::handle_mousepress(btn, x, y);
 }
 
 /// Needed to get freehand painting tools (hold down mouse and move to edit).
-void Editor_Interactive::set_sel_pos(Widelands::Node_and_Triangle<> const sel) {
+void EditorInteractive::set_sel_pos(Widelands::NodeAndTriangle<> const sel) {
 	bool const target_changed =
 	    tools.current().operates_on_triangles() ?
 	    sel.triangle != get_sel_pos().triangle : sel.node != get_sel_pos().node;
-	Interactive_Base::set_sel_pos(sel);
+	InteractiveBase::set_sel_pos(sel);
 	if (target_changed && m_left_mouse_button_is_down)
 		map_clicked(true);
 }
 
-void Editor_Interactive::toggle_buildhelp() {
+void EditorInteractive::toggle_buildhelp() {
 	egbase().map().overlay_manager().toggle_buildhelp();
 }
 
 
-void Editor_Interactive::tool_menu_btn() {
+void EditorInteractive::tool_menu_btn() {
 	if (m_toolmenu.window)
 		delete m_toolmenu.window;
 	else
-		new Editor_Tool_Menu(*this, m_toolmenu);
+		new EditorToolMenu(*this, m_toolmenu);
 }
 
 
-void Editor_Interactive::toggle_playermenu() {
+void EditorInteractive::toggle_playermenu() {
 	if (m_playermenu.window)
 		delete m_playermenu.window;
 	else {
-		select_tool(tools.set_starting_pos, Editor_Tool::First);
-		new Editor_Player_Menu(*this, m_playermenu);
+		select_tool(tools.set_starting_pos, EditorTool::First);
+		new EditorPlayerMenu(*this, m_playermenu);
 	}
 
 }
 
-void Editor_Interactive::toolsize_menu_btn() {
+void EditorInteractive::toolsize_menu_btn() {
 	if (m_toolsizemenu.window)
 		delete m_toolsizemenu.window;
 	else
-		new Editor_Toolsize_Menu(*this, m_toolsizemenu);
+		new EditorToolsizeMenu(*this, m_toolsizemenu);
 }
 
-void Editor_Interactive::set_sel_radius_and_update_menu(uint32_t const val) {
+void EditorInteractive::set_sel_radius_and_update_menu(uint32_t const val) {
 	if (tools.current().has_size_one())
 		return;
 	if (UI::UniqueWindow * const w = m_toolsizemenu.window)
-		ref_cast<Editor_Toolsize_Menu, UI::UniqueWindow>(*w).update(val);
+		ref_cast<EditorToolsizeMenu, UI::UniqueWindow>(*w).update(val);
 	else
 		set_sel_radius(val);
 }
 
 
-bool Editor_Interactive::handle_key(bool const down, SDL_keysym const code) {
-	bool handled = Interactive_Base::handle_key(down, code);
+bool EditorInteractive::handle_key(bool const down, SDL_keysym const code) {
+	bool handled = InteractiveBase::handle_key(down, code);
 
 	if (down) {
 		// only on down events
@@ -395,16 +395,16 @@
 
 		case SDLK_LSHIFT:
 		case SDLK_RSHIFT:
-			if (tools.use_tool == Editor_Tool::First)
-				select_tool(tools.current(), Editor_Tool::Second);
+			if (tools.use_tool == EditorTool::First)
+				select_tool(tools.current(), EditorTool::Second);
 			handled = true;
 			break;
 
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
-			if (tools.use_tool == Editor_Tool::First)
-				select_tool(tools.current(), Editor_Tool::Third);
+			if (tools.use_tool == EditorTool::First)
+				select_tool(tools.current(), EditorTool::Third);
 			handled = true;
 			break;
 
@@ -415,8 +415,8 @@
 
 		case SDLK_c:
 			set_display_flag
-			(Interactive_Base::dfShowCensus,
-			 !get_display_flag(Interactive_Base::dfShowCensus));
+			(InteractiveBase::dfShowCensus,
+			 !get_display_flag(InteractiveBase::dfShowCensus));
 			handled = true;
 			break;
 
@@ -431,7 +431,7 @@
 			break;
 
 		case SDLK_i:
-			select_tool(tools.info, Editor_Tool::First);
+			select_tool(tools.info, EditorTool::First);
 			handled = true;
 			break;
 
@@ -442,7 +442,7 @@
 
 		case SDLK_l:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				new Main_Menu_Load_Map(*this);
+				new MainMenuLoadMap(*this);
 			handled = true;
 			break;
 
@@ -453,7 +453,7 @@
 
 		case SDLK_s:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				new Main_Menu_Save_Map(*this);
+				new MainMenuSaveMap(*this);
 			handled = true;
 			break;
 
@@ -486,8 +486,8 @@
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
-			if (tools.use_tool != Editor_Tool::First)
-				select_tool(tools.current(), Editor_Tool::First);
+			if (tools.use_tool != EditorTool::First)
+				select_tool(tools.current(), EditorTool::First);
 			handled = true;
 			break;
 		default:
@@ -498,9 +498,9 @@
 }
 
 
-void Editor_Interactive::select_tool
-(Editor_Tool & primary, Editor_Tool::Tool_Index const which) {
-	if (which == Editor_Tool::First && & primary != tools.current_pointer) {
+void EditorInteractive::select_tool
+(EditorTool & primary, EditorTool::ToolIndex const which) {
+	if (which == EditorTool::First && & primary != tools.current_pointer) {
 		if (primary.has_size_one())
 			set_sel_radius_and_update_menu(0);
 		Widelands::Map & map = egbase().map();
@@ -524,12 +524,12 @@
  *
  *  data is a pointer to a tribe (for buildings)
  */
-void Editor_Interactive::reference_player_tribe
-(Widelands::Player_Number player, void const * const data) {
+void EditorInteractive::reference_player_tribe
+(Widelands::PlayerNumber player, void const * const data) {
 	assert(0 < player);
 	assert(player <= egbase().map().get_nrplayers());
 
-	Player_References r;
+	PlayerReferences r;
 	r.player = player;
 	r.object = data;
 
@@ -537,14 +537,14 @@
 }
 
 /// Unreference !once!, if referenced many times, this will leak a reference.
-void Editor_Interactive::unreference_player_tribe
-(Widelands::Player_Number const player, void const * const data) {
+void EditorInteractive::unreference_player_tribe
+(Widelands::PlayerNumber const player, void const * const data) {
 	assert(player <= egbase().map().get_nrplayers());
 	assert(data);
 
-	std::vector<Player_References> & references = m_player_tribe_references;
-	std::vector<Player_References>::iterator it = references.begin();
-	std::vector<Player_References>::const_iterator references_end =
+	std::vector<PlayerReferences> & references = m_player_tribe_references;
+	std::vector<PlayerReferences>::iterator it = references.begin();
+	std::vector<PlayerReferences>::const_iterator references_end =
 	    references.end();
 	if (player) {
 		for (; it < references_end; ++it)
@@ -561,8 +561,8 @@
 				++it;
 }
 
-bool Editor_Interactive::is_player_tribe_referenced
-(Widelands::Player_Number const  player) {
+bool EditorInteractive::is_player_tribe_referenced
+(Widelands::PlayerNumber const  player) {
 	assert(0 < player);
 	assert(player <= egbase().map().get_nrplayers());
 
@@ -573,9 +573,9 @@
 	return false;
 }
 
-void Editor_Interactive::run_editor(const std::string& filename, const std::string& script_to_run) {
-	Widelands::Editor_Game_Base editor(nullptr);
-	Editor_Interactive eia(editor);
+void EditorInteractive::run_editor(const std::string& filename, const std::string& script_to_run) {
+	Widelands::EditorGameBase editor(nullptr);
+	EditorInteractive eia(editor);
 	editor.set_ibase(&eia); // TODO(unknown): get rid of this
 	{
 		UI::ProgressWindow loader_ui("pics/editor.jpg");
@@ -606,7 +606,7 @@
 			}
 		}
 
-		eia.select_tool(eia.tools.increase_height, Editor_Tool::First);
+		eia.select_tool(eia.tools.increase_height, EditorTool::First);
 		editor.postload();
 		eia.start();
 

=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h	2014-07-26 10:43:23 +0000
+++ src/editor/editorinteractive.h	2014-09-18 15:54:00 +0000
@@ -37,21 +37,21 @@
 #include "wui/interactive_base.h"
 
 class Editor;
-class Editor_Tool;
+class EditorTool;
 
 /**
  * This is the EditorInteractive. It is like the InteractivePlayer class,
  * but for the Editor instead of the game
  */
-struct Editor_Interactive : public Interactive_Base {
-	friend struct Editor_Tool_Menu;
+struct EditorInteractive : public InteractiveBase {
+	friend struct EditorToolMenu;
 
 	// Runs the Editor via the commandline --editor flag. Will load 'filename' as a
 	// map and run 'script_to_run' directly after all initialization is done.
 	static void run_editor(const std::string & filename, const std::string& script_to_run);
 
 private:
-	Editor_Interactive(Widelands::Editor_Game_Base &);
+	EditorInteractive(Widelands::EditorGameBase &);
 
 public:
 	void register_overlays();
@@ -62,7 +62,7 @@
 	void think() override;
 
 	void map_clicked(bool draw = false);
-	void set_sel_pos(Widelands::Node_and_Triangle<>) override;
+	void set_sel_pos(Widelands::NodeAndTriangle<>) override;
 	void set_sel_radius_and_update_menu(uint32_t);
 
 	//  Handle UI elements.
@@ -74,7 +74,7 @@
 		Tools()
 			:
 			current_pointer(&increase_height),
-			use_tool(Editor_Tool::First),
+			use_tool(EditorTool::First),
 			increase_height(decrease_height, set_height),
 			noise_height(set_height),
 			place_immovable(delete_immovable),
@@ -82,32 +82,32 @@
 			increase_resources(decrease_resources, set_resources),
 			set_port_space(unset_port_space)
 		{}
-		Editor_Tool & current() const {return *current_pointer;}
-		typedef std::vector<Editor_Tool *> Tool_Vector;
-		//Tool_Vector                     tools;
-		Editor_Tool          *          current_pointer;
-		Editor_Tool::Tool_Index         use_tool;
-		Editor_Info_Tool                info;
-		Editor_Set_Height_Tool          set_height;
-		Editor_Decrease_Height_Tool     decrease_height;
-		Editor_Increase_Height_Tool     increase_height;
-		Editor_Noise_Height_Tool        noise_height;
-		Editor_Set_Terrain_Tool         set_terrain;
-		Editor_Delete_Immovable_Tool    delete_immovable;
-		Editor_Place_Immovable_Tool     place_immovable;
-		Editor_Set_Starting_Pos_Tool    set_starting_pos;
-		Editor_Delete_Bob_Tool          delete_bob;
-		Editor_Place_Bob_Tool           place_bob;
-		Editor_Decrease_Resources_Tool  decrease_resources;
-		Editor_Set_Resources_Tool       set_resources;
-		Editor_Increase_Resources_Tool  increase_resources;
-		Editor_Set_Port_Space_Tool      set_port_space;
-		Editor_Unset_Port_Space_Tool    unset_port_space;
-		Editor_Set_Origin_Tool          set_origin;
-		Editor_Make_Infrastructure_Tool make_infrastructure;
+		EditorTool & current() const {return *current_pointer;}
+		using ToolVector = std::vector<EditorTool *>;
+		//ToolVector                     tools;
+		EditorTool          *          current_pointer;
+		EditorTool::ToolIndex         use_tool;
+		EditorInfoTool                info;
+		EditorSetHeightTool          set_height;
+		EditorDecreaseHeightTool     decrease_height;
+		EditorIncreaseHeightTool     increase_height;
+		EditorNoiseHeightTool        noise_height;
+		EditorSetTerrainTool         set_terrain;
+		EditorDeleteImmovableTool    delete_immovable;
+		EditorPlaceImmovableTool     place_immovable;
+		EditorSetStartingPosTool    set_starting_pos;
+		EditorDeleteBobTool          delete_bob;
+		EditorPlaceBobTool           place_bob;
+		EditorDecreaseResourcesTool  decrease_resources;
+		EditorSetResourcesTool       set_resources;
+		EditorIncreaseResourcesTool  increase_resources;
+		EditorSetPortSpaceTool      set_port_space;
+		EditorUnsetPortSpaceTool    unset_port_space;
+		EditorSetOriginTool          set_origin;
+		EditorMakeInfrastructureTool make_infrastructure;
 	} tools;
 
-	void select_tool(Editor_Tool &, Editor_Tool::Tool_Index);
+	void select_tool(EditorTool &, EditorTool::ToolIndex);
 
 	Widelands::Player * get_player() const override {return nullptr;}
 
@@ -115,9 +115,9 @@
 	void exit();
 
 	//  reference functions
-	void   reference_player_tribe(Widelands::Player_Number, void const * const) override;
-	void unreference_player_tribe(Widelands::Player_Number, void const * const);
-	bool is_player_tribe_referenced(Widelands::Player_Number);
+	void   reference_player_tribe(Widelands::PlayerNumber, void const * const) override;
+	void unreference_player_tribe(Widelands::PlayerNumber, void const * const);
+	bool is_player_tribe_referenced(Widelands::PlayerNumber);
 	void set_need_save(bool const t) {m_need_save = t;}
 
 private:
@@ -129,16 +129,16 @@
 
 	//  state variables
 	bool m_need_save;
-	struct Player_References {
+	struct PlayerReferences {
 		int32_t      player;
 		void const * object;
 	};
-	std::vector<Player_References> m_player_tribe_references;
+	std::vector<PlayerReferences> m_player_tribe_references;
 
 	int32_t m_realtime;
 	bool m_left_mouse_button_is_down;
 
-	Editor_History m_history;
+	EditorHistory m_history;
 
 	UI::UniqueWindow::Registry m_toolmenu;
 

=== modified file 'src/editor/map_generator.cc'
--- src/editor/map_generator.cc	2014-07-25 22:17:48 +0000
+++ src/editor/map_generator.cc	2014-09-18 15:54:00 +0000
@@ -40,7 +40,7 @@
 
 namespace Widelands {
 
-MapGenerator::MapGenerator(Map& map, const UniqueRandomMapInfo& mapInfo, Editor_Game_Base& egbase) :
+MapGenerator::MapGenerator(Map& map, const UniqueRandomMapInfo& mapInfo, EditorGameBase& egbase) :
 	map_(map),
 	map_info_(mapInfo),
 	egbase_(egbase)
@@ -126,12 +126,12 @@
 	// TODO(unknown): Check how the editor handles this...
 
 	const World& world = egbase_.world();
-	Terrain_Index const tix = fc.field->get_terrains().d;
+	TerrainIndex const tix = fc.field->get_terrains().d;
 	const TerrainDescription& terrain_description = egbase_.world().terrain_descr(tix);
 
 	const auto set_resource_helper = [this, &world, &terrain_description, &fc] (
 	   const uint32_t random_value, const int valid_resource_index) {
-		const Resource_Index  res_idx = terrain_description.get_valid_resource(valid_resource_index);
+		const ResourceIndex  res_idx = terrain_description.get_valid_resource(valid_resource_index);
 		const uint32_t max_amount = world.get_resource(res_idx)->max_amount();
 		uint8_t res_val = static_cast<uint8_t>(random_value / (kMaxElevation / max_amount));
 		res_val *= static_cast<uint8_t>(map_info_.resource_amount) + 1;
@@ -227,8 +227,8 @@
 	if (map_info_.islandMode) {
 		int32_t const border_dist =
 			std::min
-				(std::min<X_Coordinate>(c.x, map_info_.w - c.x),
-				 std::min<Y_Coordinate>(c.y, map_info_.h - c.y));
+				(std::min<int16_t>(c.x, map_info_.w - c.x),
+				 std::min<int16_t>(c.y, map_info_.h - c.y));
 		if (border_dist <= kIslandBorder) {
 			res_h =
 				static_cast<uint8_t>
@@ -442,7 +442,7 @@
 terrType:    Returns the terrain-Type fpor this triangle
 ===============
 */
-Terrain_Index MapGenerator::figure_out_terrain
+TerrainIndex MapGenerator::figure_out_terrain
 	(uint32_t                  * const random2,
 	 uint32_t                  * const random3,
 	 uint32_t                  * const random4,
@@ -770,16 +770,16 @@
 
 	// Random placement of starting positions
 	assert(map_info_.numPlayers);
-	std::vector<Player_Number> pn(map_info_.numPlayers);
-	for (Player_Number n = 1; n <= map_info_.numPlayers; ++n) {
+	std::vector<PlayerNumber> pn(map_info_.numPlayers);
+	for (PlayerNumber n = 1; n <= map_info_.numPlayers; ++n) {
 		bool okay = false;
 		// This is a kinda dump algorithm -> we generate a random number and increase it until it fits.
 		// However it's working and simple ;) - if you've got a better idea, feel free to fix it.
-		Player_Number x = rng.rand() % map_info_.numPlayers;
+		PlayerNumber x = rng.rand() % map_info_.numPlayers;
 		while (!okay) {
 			okay = true;
-			++x; // Player_Number begins at 1 not at 0
-			for (Player_Number p = 1; p < n; ++p) {
+			++x; // PlayerNumber begins at 1 not at 0
+			for (PlayerNumber p = 1; p < n; ++p) {
 				if (pn[p - 1] == x) {
 					okay = false;
 					x = x % map_info_.numPlayers;
@@ -790,7 +790,7 @@
 		pn[n - 1] = x;
 	}
 
-	for (Player_Number n = 1; n <= map_info_.numPlayers; ++n) {
+	for (PlayerNumber n = 1; n <= map_info_.numPlayers; ++n) {
 		// Set scenario information - needed even if it's not a scenario
 		map_.set_scenario_player_name(n, "Random Player");
 		map_.set_scenario_player_tribe(n, tribe);
@@ -1010,7 +1010,7 @@
 
 	// Convert amount of resources
 	mapInfo_out.resource_amount =
-		static_cast<Widelands::UniqueRandomMapInfo::Resource_Amount>
+		static_cast<Widelands::UniqueRandomMapInfo::ResourceAmount>
 			((nums[6] & 0xc) >> 2);
 
 	if

=== modified file 'src/editor/map_generator.h'
--- src/editor/map_generator.h	2014-07-05 16:41:51 +0000
+++ src/editor/map_generator.h	2014-09-18 15:54:00 +0000
@@ -30,7 +30,7 @@
 namespace Widelands {
 
 class Map;
-class Editor_Game_Base;
+class EditorGameBase;
 
 /**
  * This helper class repesents the complete map initialization
@@ -43,7 +43,7 @@
  */
 struct UniqueRandomMapInfo {
 
-	enum Resource_Amount
+	enum ResourceAmount
 	{
 		raLow    = 0,
 		raMedium = 1,
@@ -53,13 +53,13 @@
 	uint32_t mapNumber;
 	uint32_t w;
 	uint32_t h;
-	Resource_Amount resource_amount;
+	ResourceAmount resource_amount;
 	std::string world_name;
 
 	double        waterRatio;     //  How much of the map is water?
 	double        landRatio;      //  How much of the map is land?
 	double        wastelandRatio; //  How much of the "land" is wasteland?
-	Player_Number numPlayers;     //  number of player to generate
+	PlayerNumber numPlayers;     //  number of player to generate
 	bool          islandMode;     //  whether the world will be an island
 
 	//  other stuff
@@ -79,7 +79,7 @@
 
 	MapGenerator
 		(Map & map, const UniqueRandomMapInfo & mapInfo,
-		 Editor_Game_Base & egbase);
+		 EditorGameBase & egbase);
 
 	void create_random_map();
 
@@ -104,7 +104,7 @@
 	static uint32_t * generate_random_value_map
 		(uint32_t w, uint32_t h, RNG & rng);
 
-	Terrain_Index figure_out_terrain
+	TerrainIndex figure_out_terrain
 		(uint32_t                  * const random2,
 		 uint32_t                  * const random3,
 		 uint32_t                  * const random4,
@@ -116,7 +116,7 @@
 	std::unique_ptr<const MapGenInfo> map_gen_info_;
 	Map& map_;
 	const UniqueRandomMapInfo& map_info_;
-	Editor_Game_Base& egbase_;
+	EditorGameBase& egbase_;
 };
 
 }

=== modified file 'src/editor/tools/editor_action_args.h'
--- src/editor/tools/editor_action_args.h	2014-07-26 16:37:37 +0000
+++ src/editor/tools/editor_action_args.h	2014-09-18 15:54:00 +0000
@@ -30,21 +30,21 @@
 class BobDescr;
 }  // namespace Widelands
 
-struct Editor_Interactive;
-struct Editor_Tool_Action;
+struct EditorInteractive;
+struct EditorToolAction;
 
 /// Class to save important and changeable properties of classes needed for actions
 // Implementations in editor_history.cc
-struct Editor_Action_Args {
-	Editor_Action_Args(Editor_Interactive & base);
+struct EditorActionArgs {
+	EditorActionArgs(EditorInteractive & base);
 
 	// TODO(sirver): This class does its own reference counting. This design is
 	// brittle and on a quick overview I have a feeling that it might not be
 	// correct.
-	Editor_Action_Args(const Editor_Action_Args&) = default;
-	Editor_Action_Args& operator = (const Editor_Action_Args&) = default;
+	EditorActionArgs(const EditorActionArgs&) = default;
+	EditorActionArgs& operator = (const EditorActionArgs&) = default;
 
-	~Editor_Action_Args();
+	~EditorActionArgs();
 
 	uint32_t sel_radius;
 
@@ -56,9 +56,9 @@
 	std::list<std::string> oimmov_types;                            // immovable change tools
 	std::list<int32_t> nimmov_types;                                // immovable change tools
 	Widelands::HeightInterval m_interval;                  // noise hight tool
-	std::list<Widelands::Terrain_Index> terrainType, origTerrainType; // set terrain tool
+	std::list<Widelands::TerrainIndex> terrainType, origTerrainType; // set terrain tool
 
-	std::list<Editor_Tool_Action *> draw_actions;                   // draw tool
+	std::list<EditorToolAction *> draw_actions;                   // draw tool
 
 	uint32_t refcount;
 };

=== modified file 'src/editor/tools/editor_decrease_height_tool.cc'
--- src/editor/tools/editor_decrease_height_tool.cc	2014-03-01 17:09:07 +0000
+++ src/editor/tools/editor_decrease_height_tool.cc	2014-09-18 15:54:00 +0000
@@ -27,11 +27,11 @@
 #include "logic/mapregion.h"
 
 /// Decreases the heights by a value. Chages surrounding nodes if necessary.
-int32_t Editor_Decrease_Height_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorDecreaseHeightTool::handle_click_impl(Widelands::Map& map,
                                                        const Widelands::World& world,
-                                                       Widelands::Node_and_Triangle<> center,
-                                                       Editor_Interactive& /* parent */,
-                                                       Editor_Action_Args& args) {
+                                                       Widelands::NodeAndTriangle<> center,
+                                                       EditorInteractive& /* parent */,
+                                                       EditorActionArgs& args) {
 	if (args.origHights.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
@@ -47,12 +47,12 @@
 	   -args.change_by);
 }
 
-int32_t Editor_Decrease_Height_Tool::handle_undo_impl
+int32_t EditorDecreaseHeightTool::handle_undo_impl
 	(Widelands::Map & map,
 	 const Widelands::World& world,
-	Widelands::Node_and_Triangle<> center,
-	Editor_Interactive & /* parent */,
-	Editor_Action_Args & args)
+	Widelands::NodeAndTriangle<> center,
+	EditorInteractive & /* parent */,
+	EditorActionArgs & args)
 {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
@@ -72,9 +72,9 @@
 	return mr.radius() + 1;
 }
 
-Editor_Action_Args Editor_Decrease_Height_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorDecreaseHeightTool::format_args_impl(EditorInteractive & parent)
 {
-	Editor_Action_Args a(parent);
+	EditorActionArgs a(parent);
 	a.change_by = m_change_by;
 	return a;
 }

=== modified file 'src/editor/tools/editor_decrease_height_tool.h'
--- src/editor/tools/editor_decrease_height_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_decrease_height_tool.h	2014-09-18 15:54:00 +0000
@@ -23,22 +23,22 @@
 #include "editor/tools/editor_tool.h"
 
 ///  Decreases the height of a node by a value.
-struct Editor_Decrease_Height_Tool : public Editor_Tool {
-	Editor_Decrease_Height_Tool() : Editor_Tool(*this, *this), m_change_by(1) {}
+struct EditorDecreaseHeightTool : public EditorTool {
+	EditorDecreaseHeightTool() : EditorTool(*this, *this), m_change_by(1) {}
 
 	int32_t handle_click_impl
 		(Widelands::Map & map,
 		 const Widelands::World& world,
-		 Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+		 Widelands::NodeAndTriangle<> center,
+		 EditorInteractive & parent, EditorActionArgs & args) override;
 
 	int32_t handle_undo_impl
 		(Widelands::Map & map,
 		 const Widelands::World& world,
-		 Widelands::Node_and_Triangle<> center,
-		 Editor_Interactive & parent, Editor_Action_Args & args) override;
+		 Widelands::NodeAndTriangle<> center,
+		 EditorInteractive & parent, EditorActionArgs & args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_decrease_height.png";

=== modified file 'src/editor/tools/editor_decrease_resources_tool.cc'
--- src/editor/tools/editor_decrease_resources_tool.cc	2014-03-23 18:26:08 +0000
+++ src/editor/tools/editor_decrease_resources_tool.cc	2014-09-18 15:54:00 +0000
@@ -36,11 +36,11 @@
  * there is not already another resource there.
 */
 int32_t
-Editor_Decrease_Resources_Tool::handle_click_impl(Widelands::Map& map,
+EditorDecreaseResourcesTool::handle_click_impl(Widelands::Map& map,
                                                   const Widelands::World& world,
-                                                  Widelands::Node_and_Triangle<> const center,
-                                                  Editor_Interactive& /* parent */,
-                                                  Editor_Action_Args& args) {
+                                                  Widelands::NodeAndTriangle<> const center,
+                                                  EditorInteractive& /* parent */,
+                                                  EditorActionArgs& args) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
 	Widelands::Area<Widelands::FCoords>
@@ -82,18 +82,18 @@
 	return mr.radius();
 }
 
-int32_t Editor_Decrease_Resources_Tool::handle_undo_impl(
+int32_t EditorDecreaseResourcesTool::handle_undo_impl(
    Widelands::Map& map,
    const Widelands::World& world,
-   Widelands::Node_and_Triangle<Widelands::Coords> center,
-   Editor_Interactive& parent,
-   Editor_Action_Args& args) {
+   Widelands::NodeAndTriangle<Widelands::Coords> center,
+   EditorInteractive& parent,
+   EditorActionArgs& args) {
 	return parent.tools.set_resources.handle_undo_impl(map, world, center, parent, args);
 }
 
-Editor_Action_Args Editor_Decrease_Resources_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorDecreaseResourcesTool::format_args_impl(EditorInteractive & parent)
 {
-	Editor_Action_Args a(parent);
+	EditorActionArgs a(parent);
 	a.change_by = m_change_by;
 	a.cur_res = m_cur_res;
 	return a;

=== modified file 'src/editor/tools/editor_decrease_resources_tool.h'
--- src/editor/tools/editor_decrease_resources_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_decrease_resources_tool.h	2014-09-18 15:54:00 +0000
@@ -23,24 +23,24 @@
 #include "editor/tools/editor_tool.h"
 
 ///  Decreases the resources of a node by a value.
-struct Editor_Decrease_Resources_Tool : public Editor_Tool {
-	Editor_Decrease_Resources_Tool()
-		: Editor_Tool(*this, *this), m_cur_res(0), m_change_by(1)
+struct EditorDecreaseResourcesTool : public EditorTool {
+	EditorDecreaseResourcesTool()
+		: EditorTool(*this, *this), m_cur_res(0), m_change_by(1)
 	{}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_decrease_resources.png";
@@ -48,13 +48,13 @@
 
 	int32_t get_change_by() const        {return m_change_by;}
 	void set_change_by(const int32_t n)  {m_change_by = n;}
-	Widelands::Resource_Index get_cur_res() const {return m_cur_res;}
-	void set_cur_res(Widelands::Resource_Index const res) {
+	Widelands::ResourceIndex get_cur_res() const {return m_cur_res;}
+	void set_cur_res(Widelands::ResourceIndex const res) {
 		m_cur_res = res;
 	}
 
 private:
-	Widelands::Resource_Index m_cur_res;
+	Widelands::ResourceIndex m_cur_res;
 	int32_t m_change_by;
 };
 

=== modified file 'src/editor/tools/editor_delete_bob_tool.cc'
--- src/editor/tools/editor_delete_bob_tool.cc	2014-03-01 17:09:07 +0000
+++ src/editor/tools/editor_delete_bob_tool.cc	2014-09-18 15:54:00 +0000
@@ -28,12 +28,12 @@
  * Deletes the bob at the given location
 */
 int32_t
-Editor_Delete_Bob_Tool::handle_click_impl(Widelands::Map& map,
+EditorDeleteBobTool::handle_click_impl(Widelands::Map& map,
                                           const Widelands::World&,
-                                          Widelands::Node_and_Triangle<Widelands::Coords> center,
-                                          Editor_Interactive& parent,
-                                          Editor_Action_Args& args) {
-	Widelands::Editor_Game_Base & egbase = parent.egbase();
+                                          Widelands::NodeAndTriangle<Widelands::Coords> center,
+                                          EditorInteractive& parent,
+                                          EditorActionArgs& args) {
+	Widelands::EditorGameBase & egbase = parent.egbase();
 	const int32_t radius = args.sel_radius;
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
@@ -51,18 +51,18 @@
 }
 
 int32_t
-Editor_Delete_Bob_Tool::handle_undo_impl(Widelands::Map& map,
+EditorDeleteBobTool::handle_undo_impl(Widelands::Map& map,
                                          const Widelands::World& world,
-                                         Widelands::Node_and_Triangle<Widelands::Coords> center,
-                                         Editor_Interactive& parent,
-                                         Editor_Action_Args& args) {
+                                         Widelands::NodeAndTriangle<Widelands::Coords> center,
+                                         EditorInteractive& parent,
+                                         EditorActionArgs& args) {
 
 	uint32_t ret = parent.tools.place_bob.handle_undo_impl(map, world, center, parent, args);
 	args.obob_type.clear();
 	return ret;
 }
 
-Editor_Action_Args Editor_Delete_Bob_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorDeleteBobTool::format_args_impl(EditorInteractive & parent)
 {
-	return Editor_Tool::format_args_impl(parent);
+	return EditorTool::format_args_impl(parent);
 }

=== modified file 'src/editor/tools/editor_delete_bob_tool.h'
--- src/editor/tools/editor_delete_bob_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_delete_bob_tool.h	2014-09-18 15:54:00 +0000
@@ -23,22 +23,22 @@
 #include "editor/tools/editor_tool.h"
 
 /// Deletes bob from the map.
-struct Editor_Delete_Bob_Tool : public Editor_Tool {
-	Editor_Delete_Bob_Tool() : Editor_Tool(*this, *this) {}
+struct EditorDeleteBobTool : public EditorTool {
+	EditorDeleteBobTool() : EditorTool(*this, *this) {}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_delete.png";

=== modified file 'src/editor/tools/editor_delete_immovable_tool.cc'
--- src/editor/tools/editor_delete_immovable_tool.cc	2014-07-03 19:26:30 +0000
+++ src/editor/tools/editor_delete_immovable_tool.cc	2014-09-18 15:54:00 +0000
@@ -28,12 +28,12 @@
 /**
  * Deletes the immovable at the given location
 */
-int32_t Editor_Delete_Immovable_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorDeleteImmovableTool::handle_click_impl(Widelands::Map& map,
                                                         const Widelands::World&,
-                                                        Widelands::Node_and_Triangle<> const center,
-                                                        Editor_Interactive& parent,
-                                                        Editor_Action_Args& args) {
-	Widelands::Editor_Game_Base & egbase = parent.egbase();
+                                                        Widelands::NodeAndTriangle<> const center,
+                                                        EditorInteractive& parent,
+                                                        EditorActionArgs& args) {
+	Widelands::EditorGameBase & egbase = parent.egbase();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 	(map,
 	 Widelands::Area<Widelands::FCoords>
@@ -53,16 +53,16 @@
 	return mr.radius() + 2;
 }
 
-int32_t Editor_Delete_Immovable_Tool::handle_undo_impl(
+int32_t EditorDeleteImmovableTool::handle_undo_impl(
    Widelands::Map& map,
    const Widelands::World& world,
-   Widelands::Node_and_Triangle<Widelands::Coords> center,
-   Editor_Interactive& parent,
-   Editor_Action_Args& args) {
+   Widelands::NodeAndTriangle<Widelands::Coords> center,
+   EditorInteractive& parent,
+   EditorActionArgs& args) {
 	return parent.tools.place_immovable.handle_undo_impl(map, world, center, parent, args);
 }
 
-Editor_Action_Args Editor_Delete_Immovable_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorDeleteImmovableTool::format_args_impl(EditorInteractive & parent)
 {
-	return Editor_Tool::format_args_impl(parent);
+	return EditorTool::format_args_impl(parent);
 }

=== modified file 'src/editor/tools/editor_delete_immovable_tool.h'
--- src/editor/tools/editor_delete_immovable_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_delete_immovable_tool.h	2014-09-18 15:54:00 +0000
@@ -23,22 +23,22 @@
 #include "editor/tools/editor_tool.h"
 
 /// Deletes immovables from the map.
-struct Editor_Delete_Immovable_Tool : public Editor_Tool {
-	Editor_Delete_Immovable_Tool() : Editor_Tool(*this, *this) {}
+struct EditorDeleteImmovableTool : public EditorTool {
+	EditorDeleteImmovableTool() : EditorTool(*this, *this) {}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_delete.png";

=== modified file 'src/editor/tools/editor_draw_tool.cc'
--- src/editor/tools/editor_draw_tool.cc	2014-07-23 14:49:10 +0000
+++ src/editor/tools/editor_draw_tool.cc	2014-09-18 15:54:00 +0000
@@ -27,50 +27,50 @@
 // TODO(unknown): Saving every action in a list isn't very efficient.
 // A long list can take several seconds to undo/redo every action.
 // If someone has a better idea how to do this, implement it!
-void Editor_Draw_Tool::add_action
-(Editor_Tool_Action ac, Editor_Action_Args & args)
+void EditorDrawTool::add_action
+(EditorToolAction ac, EditorActionArgs & args)
 {
-	args.draw_actions.push_back(new Editor_Tool_Action(ac));
+	args.draw_actions.push_back(new EditorToolAction(ac));
 }
 
 int32_t
-Editor_Draw_Tool::handle_click_impl(Widelands::Map& /* map */,
+EditorDrawTool::handle_click_impl(Widelands::Map& /* map */,
                                     const Widelands::World& world,
-                                    Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
-                                    Editor_Interactive& /* parent */,
-                                    Editor_Action_Args& args) {
+                                    Widelands::NodeAndTriangle<Widelands::Coords> /* center */,
+                                    EditorInteractive& /* parent */,
+                                    EditorActionArgs& args) {
 
 	for
-		(std::list<Editor_Tool_Action *>::iterator i = args.draw_actions.begin();
+		(std::list<EditorToolAction *>::iterator i = args.draw_actions.begin();
 	        i != args.draw_actions.end();
 	        ++i)
 	{
 		(*i)->tool.handle_click
-			(static_cast<Editor_Tool::Tool_Index>((*i)->i),
+			(static_cast<EditorTool::ToolIndex>((*i)->i),
 				(*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
 	}
 	return args.draw_actions.size();
 }
 
 int32_t
-Editor_Draw_Tool::handle_undo_impl(Widelands::Map& /* map */,
+EditorDrawTool::handle_undo_impl(Widelands::Map& /* map */,
                                    const Widelands::World& world,
-                                   Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
-                                   Editor_Interactive& /* parent */,
-                                   Editor_Action_Args& args) {
+                                   Widelands::NodeAndTriangle<Widelands::Coords> /* center */,
+                                   EditorInteractive& /* parent */,
+                                   EditorActionArgs& args) {
 	for
-		(std::list<Editor_Tool_Action *>::reverse_iterator i = args.draw_actions.rbegin();
+		(std::list<EditorToolAction *>::reverse_iterator i = args.draw_actions.rbegin();
 	        i != args.draw_actions.rend();
 	        ++i)
 	{
 		(*i)->tool.handle_undo
-		(static_cast<Editor_Tool::Tool_Index>((*i)->i),
+		(static_cast<EditorTool::ToolIndex>((*i)->i),
 			(*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
 	}
 	return args.draw_actions.size();
 }
 
-Editor_Action_Args Editor_Draw_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorDrawTool::format_args_impl(EditorInteractive & parent)
 {
-	return Editor_Tool::format_args_impl(parent);
+	return EditorTool::format_args_impl(parent);
 }

=== modified file 'src/editor/tools/editor_draw_tool.h'
--- src/editor/tools/editor_draw_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_draw_tool.h	2014-09-18 15:54:00 +0000
@@ -25,28 +25,28 @@
 
 ///  This is not a real editor tool. It serves to combine 'hold down mouse and move'
 ///  tool actions in one class.
-struct Editor_Draw_Tool : public Editor_Tool {
-	Editor_Draw_Tool() : Editor_Tool(*this, *this) {}
+struct EditorDrawTool : public EditorTool {
+	EditorDrawTool() : EditorTool(*this, *this) {}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "EDITOR_DRAW_TOOL";
 	}
 
-	void add_action(Editor_Tool_Action ac, Editor_Action_Args & args);
+	void add_action(EditorToolAction ac, EditorActionArgs & args);
 
 };
 

=== modified file 'src/editor/tools/editor_history.cc'
--- src/editor/tools/editor_history.cc	2014-07-20 07:43:07 +0000
+++ src/editor/tools/editor_history.cc	2014-09-18 15:54:00 +0000
@@ -25,9 +25,9 @@
 #include "editor/tools/editor_action_args.h"
 #include "editor/tools/editor_tool_action.h"
 
-// === Editor_Action_Args === //
+// === EditorActionArgs === //
 
-Editor_Action_Args::Editor_Action_Args(Editor_Interactive & base):
+EditorActionArgs::EditorActionArgs(EditorInteractive & base):
 	sel_radius(base.get_sel_radius()),
 	change_by(0),
 	cur_res(0),
@@ -36,7 +36,7 @@
 	refcount(0)
 {}
 
-Editor_Action_Args::~Editor_Action_Args()
+EditorActionArgs::~EditorActionArgs()
 {
 	while (!draw_actions.empty()) {
 		delete draw_actions.back();
@@ -53,20 +53,20 @@
 	terrainType.clear();
 }
 
-// === Editor_History === //
+// === EditorHistory === //
 
-uint32_t Editor_History::undo_action(const Widelands::World& world) {
+uint32_t EditorHistory::undo_action(const Widelands::World& world) {
 	if (undo_stack.empty())
 		return 0;
 
-	Editor_Tool_Action uac = undo_stack.front();
+	EditorToolAction uac = undo_stack.front();
 	undo_stack.pop_front();
 	redo_stack.push_front(uac);
 
 	m_undo_button.set_enabled(!undo_stack.empty());
 	m_redo_button.set_enabled(true);
 
-	return uac.tool.handle_undo(static_cast<Editor_Tool::Tool_Index>(uac.i),
+	return uac.tool.handle_undo(static_cast<EditorTool::ToolIndex>(uac.i),
 	                            uac.map,
 	                            world,
 	                            uac.center,
@@ -74,18 +74,18 @@
 	                            *uac.args);
 }
 
-uint32_t Editor_History::redo_action(const Widelands::World& world) {
+uint32_t EditorHistory::redo_action(const Widelands::World& world) {
 	if (redo_stack.empty())
 		return 0;
 
-	Editor_Tool_Action rac = redo_stack.front();
+	EditorToolAction rac = redo_stack.front();
 	redo_stack.pop_front();
 	undo_stack.push_front(rac);
 
 	m_undo_button.set_enabled(true);
 	m_redo_button.set_enabled(!redo_stack.empty());
 
-	return rac.tool.handle_click(static_cast<Editor_Tool::Tool_Index>(rac.i),
+	return rac.tool.handle_click(static_cast<EditorTool::ToolIndex>(rac.i),
 	                             rac.map,
 	                             world,
 	                             rac.center,
@@ -93,14 +93,14 @@
 	                             *rac.args);
 }
 
-uint32_t Editor_History::do_action(Editor_Tool& tool,
-                                   Editor_Tool::Tool_Index ind,
+uint32_t EditorHistory::do_action(EditorTool& tool,
+											  EditorTool::ToolIndex ind,
                                    Widelands::Map& map,
                                    const Widelands::World& world,
-                                   const Widelands::Node_and_Triangle<Widelands::Coords> center,
-                                   Editor_Interactive& parent,
+                                   const Widelands::NodeAndTriangle<Widelands::Coords> center,
+											  EditorInteractive& parent,
                                    bool draw) {
-	Editor_Tool_Action ac
+	EditorToolAction ac
 		(tool, static_cast<uint32_t>(ind),
 		 map, center, parent, tool.format_args(ind, parent));
 	if (draw && tool.is_unduable()) {
@@ -108,10 +108,10 @@
 			(undo_stack.empty() ||
 			 undo_stack.front().tool.get_sel_impl() != std::string(m_draw_tool.get_sel_impl()))
 		{
-			Editor_Tool_Action da
-				(m_draw_tool, Editor_Tool::First,
+			EditorToolAction da
+				(m_draw_tool, EditorTool::First,
 				 map, center, parent,
-				 m_draw_tool.format_args(Editor_Tool::First, parent));
+				 m_draw_tool.format_args(EditorTool::First, parent));
 
 			if (!undo_stack.empty()) {
 				m_draw_tool.add_action(undo_stack.front(), *da.args);
@@ -123,7 +123,7 @@
 			m_undo_button.set_enabled(true);
 			m_redo_button.set_enabled(false);
 		}
-		dynamic_cast<Editor_Draw_Tool *>
+		dynamic_cast<EditorDrawTool *>
 			(&(undo_stack.front().tool))->add_action(ac, *undo_stack.front().args);
 	} else if (tool.is_unduable()) {
 		redo_stack.clear();
@@ -135,7 +135,7 @@
 }
 
 
-void Editor_History::reset()
+void EditorHistory::reset()
 {
 	undo_stack.clear();
 	redo_stack.clear();

=== modified file 'src/editor/tools/editor_history.h'
--- src/editor/tools/editor_history.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_history.h	2014-09-18 15:54:00 +0000
@@ -25,8 +25,8 @@
 #include "editor/tools/editor_draw_tool.h"
 #include "editor/tools/editor_tool.h"
 
-//struct Editor_Action_Args;
-struct Editor_Interactive;
+//struct EditorActionArgs;
+struct EditorInteractive;
 namespace UI {struct Button;}
 
 /**
@@ -34,17 +34,17 @@
  * provide undo / redo functionality.
  * Do all tool action you want to make "undoable" using this class.
  */
-struct Editor_History {
+struct EditorHistory {
 
-	Editor_History(UI::Button & undo, UI::Button & redo):
+	EditorHistory(UI::Button & undo, UI::Button & redo):
 		m_undo_button(undo), m_redo_button(redo) {}
 
-	uint32_t do_action(Editor_Tool& tool,
-	                   Editor_Tool::Tool_Index ind,
+	uint32_t do_action(EditorTool& tool,
+							 EditorTool::ToolIndex ind,
 	                   Widelands::Map& map,
 	                   const Widelands::World& world,
-	                   Widelands::Node_and_Triangle<> const center,
-	                   Editor_Interactive& parent,
+	                   Widelands::NodeAndTriangle<> const center,
+							 EditorInteractive& parent,
 	                   bool draw = false);
 	uint32_t undo_action(const Widelands::World& world);
 	uint32_t redo_action(const Widelands::World& world);
@@ -57,10 +57,10 @@
 	UI::Button & m_undo_button;
 	UI::Button & m_redo_button;
 
-	Editor_Draw_Tool m_draw_tool;
+	EditorDrawTool m_draw_tool;
 
-	std::deque<Editor_Tool_Action> undo_stack;
-	std::deque<Editor_Tool_Action> redo_stack;
+	std::deque<EditorToolAction> undo_stack;
+	std::deque<EditorToolAction> redo_stack;
 
 };
 

=== modified file 'src/editor/tools/editor_increase_height_tool.cc'
--- src/editor/tools/editor_increase_height_tool.cc	2014-03-01 17:09:07 +0000
+++ src/editor/tools/editor_increase_height_tool.cc	2014-09-18 15:54:00 +0000
@@ -25,11 +25,11 @@
 #include "logic/mapregion.h"
 
 /// Increases the heights by a value. Chages surrounding nodes if necessary.
-int32_t Editor_Increase_Height_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorIncreaseHeightTool::handle_click_impl(Widelands::Map& map,
                                                        const Widelands::World& world,
-                                                       Widelands::Node_and_Triangle<> center,
-                                                       Editor_Interactive& /* parent */,
-                                                       Editor_Action_Args& args) {
+                                                       Widelands::NodeAndTriangle<> center,
+                                                       EditorInteractive& /* parent */,
+                                                       EditorActionArgs& args) {
 	if (args.origHights.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
 		   map,
@@ -47,17 +47,17 @@
 	   args.change_by);
 }
 
-int32_t Editor_Increase_Height_Tool::handle_undo_impl(Widelands::Map& map,
+int32_t EditorIncreaseHeightTool::handle_undo_impl(Widelands::Map& map,
                                                       const Widelands::World& world,
-                                                      Widelands::Node_and_Triangle<> center,
-                                                      Editor_Interactive& parent,
-                                                      Editor_Action_Args& args) {
+                                                      Widelands::NodeAndTriangle<> center,
+                                                      EditorInteractive& parent,
+                                                      EditorActionArgs& args) {
 	return m_decrease_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
-Editor_Action_Args Editor_Increase_Height_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorIncreaseHeightTool::format_args_impl(EditorInteractive & parent)
 {
-	Editor_Action_Args a(parent);
+	EditorActionArgs a(parent);
 	a.change_by = m_change_by;
 	return a;
 }

=== modified file 'src/editor/tools/editor_increase_height_tool.h'
--- src/editor/tools/editor_increase_height_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_increase_height_tool.h	2014-09-18 15:54:00 +0000
@@ -24,29 +24,29 @@
 #include "editor/tools/editor_set_height_tool.h"
 
 ///  Increases the height of a field by a value.
-struct Editor_Increase_Height_Tool : public Editor_Tool {
-	Editor_Increase_Height_Tool
-	(Editor_Decrease_Height_Tool & the_decrease_tool,
-	 Editor_Set_Height_Tool    &   the_set_tool)
+struct EditorIncreaseHeightTool : public EditorTool {
+	EditorIncreaseHeightTool
+	(EditorDecreaseHeightTool & the_decrease_tool,
+	 EditorSetHeightTool    &   the_set_tool)
 		:
-		Editor_Tool(the_decrease_tool, the_set_tool),
+		EditorTool(the_decrease_tool, the_set_tool),
 		m_decrease_tool(the_decrease_tool), m_set_tool(the_set_tool),
 		m_change_by(1)
 	{}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_increase_height.png";
@@ -55,14 +55,14 @@
 	int32_t get_change_by() const {return m_change_by;}
 	void set_change_by(const int32_t n) {m_change_by = n;}
 
-	Editor_Decrease_Height_Tool & decrease_tool() const {
+	EditorDecreaseHeightTool & decrease_tool() const {
 		return m_decrease_tool;
 	}
-	Editor_Set_Height_Tool    &   set_tool() const {return m_set_tool;}
+	EditorSetHeightTool    &   set_tool() const {return m_set_tool;}
 
 private:
-	Editor_Decrease_Height_Tool & m_decrease_tool;
-	Editor_Set_Height_Tool      & m_set_tool;
+	EditorDecreaseHeightTool & m_decrease_tool;
+	EditorSetHeightTool      & m_set_tool;
 	int32_t                       m_change_by;
 };
 

=== modified file 'src/editor/tools/editor_increase_resources_tool.cc'
--- src/editor/tools/editor_increase_resources_tool.cc	2014-07-20 07:43:07 +0000
+++ src/editor/tools/editor_increase_resources_tool.cc	2014-09-18 15:54:00 +0000
@@ -33,7 +33,7 @@
 namespace  {
 
 int32_t resource_value(const Widelands::TerrainDescription& terrain,
-                       const Widelands::Resource_Index resource) {
+                       const Widelands::ResourceIndex resource) {
 	if (!terrain.is_resource_valid(resource)) {
 		return -1;
 	}
@@ -78,18 +78,18 @@
 
 /*
 ===========
-Editor_Increase_Resources_Tool::handle_click_impl()
+EditorIncreaseResourcesTool::handle_click_impl()
 
 increase the resources of the current field by one if
 there is not already another resource there.
 ===========
 */
 int32_t
-Editor_Increase_Resources_Tool::handle_click_impl(Widelands::Map& map,
+EditorIncreaseResourcesTool::handle_click_impl(Widelands::Map& map,
                                                   const Widelands::World& world,
-                                                  Widelands::Node_and_Triangle<> const center,
-                                                  Editor_Interactive& /* parent */,
-                                                  Editor_Action_Args& args) {
+                                                  Widelands::NodeAndTriangle<> const center,
+                                                  EditorInteractive& /* parent */,
+                                                  EditorActionArgs& args) {
 	OverlayManager & overlay_manager = map.overlay_manager();
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
@@ -137,18 +137,18 @@
 	return mr.radius();
 }
 
-int32_t Editor_Increase_Resources_Tool::handle_undo_impl(
+int32_t EditorIncreaseResourcesTool::handle_undo_impl(
    Widelands::Map& map,
    const Widelands::World& world,
-   Widelands::Node_and_Triangle<Widelands::Coords> center,
-   Editor_Interactive& parent,
-   Editor_Action_Args& args) {
+   Widelands::NodeAndTriangle<Widelands::Coords> center,
+   EditorInteractive& parent,
+   EditorActionArgs& args) {
 	return m_set_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
-Editor_Action_Args Editor_Increase_Resources_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorIncreaseResourcesTool::format_args_impl(EditorInteractive & parent)
 {
-	Editor_Action_Args a(parent);
+	EditorActionArgs a(parent);
 	a.change_by = m_change_by;
 	a.cur_res = m_cur_res;
 	return a;

=== modified file 'src/editor/tools/editor_increase_resources_tool.h'
--- src/editor/tools/editor_increase_resources_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_increase_resources_tool.h	2014-09-18 15:54:00 +0000
@@ -25,10 +25,10 @@
 #include "logic/widelands_geometry.h"
 
 /// Increases the resources of a node by a value.
-struct Editor_Increase_Resources_Tool : public Editor_Tool {
-	Editor_Increase_Resources_Tool(Editor_Decrease_Resources_Tool& the_decrease_tool,
-	                               Editor_Set_Resources_Tool& the_set_to_tool)
-	   : Editor_Tool(the_decrease_tool, the_set_to_tool),
+struct EditorIncreaseResourcesTool : public EditorTool {
+	EditorIncreaseResourcesTool(EditorDecreaseResourcesTool& the_decrease_tool,
+											 EditorSetResourcesTool& the_set_to_tool)
+	   : EditorTool(the_decrease_tool, the_set_to_tool),
 	     m_decrease_tool(the_decrease_tool),
 	     m_set_tool(the_set_to_tool),
 	     m_change_by(1),
@@ -37,17 +37,17 @@
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_increase_resources.png";
@@ -55,21 +55,21 @@
 
 	int32_t get_change_by() const        {return m_change_by;}
 	void set_change_by(const int32_t n)  {m_change_by = n;}
-	Widelands::Resource_Index get_cur_res() const {return m_cur_res;}
-	void set_cur_res(Widelands::Resource_Index const res) {
+	Widelands::ResourceIndex get_cur_res() const {return m_cur_res;}
+	void set_cur_res(Widelands::ResourceIndex const res) {
 		m_cur_res = res;
 	}
 
-	Editor_Decrease_Resources_Tool & decrease_tool() const {
+	EditorDecreaseResourcesTool & decrease_tool() const {
 		return m_decrease_tool;
 	}
-	Editor_Set_Resources_Tool    &   set_tool() const {return m_set_tool;}
+	EditorSetResourcesTool    &   set_tool() const {return m_set_tool;}
 
 private:
-	Editor_Decrease_Resources_Tool & m_decrease_tool;
-	Editor_Set_Resources_Tool& m_set_tool;
+	EditorDecreaseResourcesTool & m_decrease_tool;
+	EditorSetResourcesTool& m_set_tool;
 	int32_t m_change_by;
-	Widelands::Resource_Index m_cur_res;
+	Widelands::ResourceIndex m_cur_res;
 };
 
 int32_t Editor_Change_Resource_Tool_Callback

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2014-07-14 10:45:44 +0000
+++ src/editor/tools/editor_info_tool.cc	2014-09-18 15:54:00 +0000
@@ -32,17 +32,17 @@
 #include "ui_basic/window.h"
 
 /// Show a window with information about the pointed at node and triangle.
-int32_t Editor_Info_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorInfoTool::handle_click_impl(Widelands::Map& map,
 					    const Widelands::World& world,
-					    Widelands::Node_and_Triangle<> center,
-					    Editor_Interactive& parent,
-					    Editor_Action_Args& /* args */) {
+					    Widelands::NodeAndTriangle<> center,
+					    EditorInteractive& parent,
+					    EditorActionArgs& /* args */) {
 	UI::Window * const w =
 	    new UI::Window
 	(&parent, "field_information", 30, 30, 400, 200,
 	 _("Field Information"));
-	UI::Multiline_Textarea * const multiline_textarea =
-	    new UI::Multiline_Textarea
+	UI::MultilineTextarea * const multiline_textarea =
+	    new UI::MultilineTextarea
 	(w, 0, 0, w->get_inner_w(), w->get_inner_h());
 
 	Widelands::Field & f = map[center.node];
@@ -105,7 +105,7 @@
 	// *** Resources info
 	buf += std::string("\n") + _("Resources:") + "\n";
 
-	Widelands::Resource_Index ridx = f.get_resources();
+	Widelands::ResourceIndex ridx = f.get_resources();
 	int ramount = f.get_resources_amount();
 
 	if (ramount > 0) {

=== modified file 'src/editor/tools/editor_info_tool.h'
--- src/editor/tools/editor_info_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_info_tool.h	2014-09-18 15:54:00 +0000
@@ -23,15 +23,15 @@
 #include "editor/tools/editor_tool.h"
 
 /// A simple tool to show information about the clicked node.
-struct Editor_Info_Tool : public Editor_Tool {
-	Editor_Info_Tool() : Editor_Tool(*this, *this, false) {
+struct EditorInfoTool : public EditorTool {
+	EditorInfoTool() : EditorTool(*this, *this, false) {
 	}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	char const* get_sel_impl() const override {
 		return "pics/fsel_editor_info.png";

=== modified file 'src/editor/tools/editor_make_infrastructure_tool.cc'
--- src/editor/tools/editor_make_infrastructure_tool.cc	2014-03-09 19:29:08 +0000
+++ src/editor/tools/editor_make_infrastructure_tool.cc	2014-09-18 15:54:00 +0000
@@ -33,7 +33,7 @@
 int32_t
 Editor_Make_Infrastructure_Tool_Callback
 	(const Widelands::TCoords<Widelands::FCoords>& c,
-	 Widelands::Editor_Game_Base& egbase,
+	 Widelands::EditorGameBase& egbase,
 	 int32_t const player)
 {
 	return egbase.player(player).get_buildcaps(c);
@@ -46,11 +46,11 @@
  *
  * Obviously, this function ignores the sel radius
 */
-int32_t Editor_Make_Infrastructure_Tool::handle_click_impl(Widelands::Map&,
+int32_t EditorMakeInfrastructureTool::handle_click_impl(Widelands::Map&,
                                                            const Widelands::World&,
-                                                           Widelands::Node_and_Triangle<> const,
-                                                           Editor_Interactive& parent,
-                                                           Editor_Action_Args& /* args */) {
+                                                           Widelands::NodeAndTriangle<> const,
+                                                           EditorInteractive& parent,
+                                                           EditorActionArgs& /* args */) {
 	show_field_action
 	(&parent, parent.egbase().get_player(m_player), &m_registry);
 

=== modified file 'src/editor/tools/editor_make_infrastructure_tool.h'
--- src/editor/tools/editor_make_infrastructure_tool.h	2014-07-23 14:49:10 +0000
+++ src/editor/tools/editor_make_infrastructure_tool.h	2014-09-18 15:54:00 +0000
@@ -24,37 +24,37 @@
 #include "ui_basic/unique_window.h"
 
 namespace Widelands {
-class Editor_Game_Base;
+class EditorGameBase;
 }  // namespace Widelands
 
 /**
  * This places immovables on the map
  */
 // TODO(unknown):  Implement undo for this tool
-struct Editor_Make_Infrastructure_Tool : public Editor_Tool {
-	Editor_Make_Infrastructure_Tool() : Editor_Tool(*this, *this, false), m_player(0) {}
+struct EditorMakeInfrastructureTool : public EditorTool {
+	EditorMakeInfrastructureTool() : EditorTool(*this, *this, false), m_player(0) {}
 
-	void set_player(Widelands::Player_Number const n)
+	void set_player(Widelands::PlayerNumber const n)
 		{m_player = n;}
-	Widelands::Player_Number get_player() const
+	Widelands::PlayerNumber get_player() const
 		{return m_player;}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	const char * get_sel_impl() const override
 		{return "pics/fsel.png";} //  Standard sel icon, most complex tool of all
 
 private:
-	Widelands::Player_Number m_player;
+	Widelands::PlayerNumber m_player;
 	UI::UniqueWindow::Registry m_registry;
 };
 
 int32_t Editor_Make_Infrastructure_Tool_Callback
 	(const Widelands::TCoords<Widelands::FCoords>& c,
-	 Widelands::Editor_Game_Base& egbase, int32_t const player);
+	 Widelands::EditorGameBase& egbase, int32_t const player);
 
 #endif  // end of include guard: WL_EDITOR_TOOLS_EDITOR_MAKE_INFRASTRUCTURE_TOOL_H

=== modified file 'src/editor/tools/editor_noise_height_tool.cc'
--- src/editor/tools/editor_noise_height_tool.cc	2014-03-01 17:09:07 +0000
+++ src/editor/tools/editor_noise_height_tool.cc	2014-09-18 15:54:00 +0000
@@ -27,11 +27,11 @@
 #include "logic/mapregion.h"
 
 /// Sets the heights to random values. Changes surrounding nodes if necessary.
-int32_t Editor_Noise_Height_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorNoiseHeightTool::handle_click_impl(Widelands::Map& map,
                                                     const Widelands::World& world,
-                                                    Widelands::Node_and_Triangle<> const center,
-                                                    Editor_Interactive& /* parent */,
-                                                    Editor_Action_Args& args) {
+                                                    Widelands::NodeAndTriangle<> const center,
+                                                    EditorInteractive& /* parent */,
+                                                    EditorActionArgs& args) {
 	if (args.origHights.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
@@ -62,17 +62,17 @@
 }
 
 int32_t
-Editor_Noise_Height_Tool::handle_undo_impl(Widelands::Map& map,
+EditorNoiseHeightTool::handle_undo_impl(Widelands::Map& map,
                                            const Widelands::World& world,
-                                           Widelands::Node_and_Triangle<Widelands::Coords> center,
-                                           Editor_Interactive& parent,
-                                           Editor_Action_Args& args) {
+                                           Widelands::NodeAndTriangle<Widelands::Coords> center,
+                                           EditorInteractive& parent,
+                                           EditorActionArgs& args) {
 	return m_set_tool.handle_undo_impl(map, world, center, parent, args);
 }
 
-Editor_Action_Args Editor_Noise_Height_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorNoiseHeightTool::format_args_impl(EditorInteractive & parent)
 {
-	Editor_Action_Args a(parent);
+	EditorActionArgs a(parent);
 	a.m_interval = m_interval;
 	return a;
 }

=== modified file 'src/editor/tools/editor_noise_height_tool.h'
--- src/editor/tools/editor_noise_height_tool.h	2014-07-26 16:37:37 +0000
+++ src/editor/tools/editor_noise_height_tool.h	2014-09-18 15:54:00 +0000
@@ -23,30 +23,30 @@
 #include "editor/tools/editor_set_height_tool.h"
 
 /// Set the height of a node to a random value within a defined interval.
-struct Editor_Noise_Height_Tool : public Editor_Tool {
-	Editor_Noise_Height_Tool
-	(Editor_Set_Height_Tool & the_set_tool,
+struct EditorNoiseHeightTool : public EditorTool {
+	EditorNoiseHeightTool
+	(EditorSetHeightTool & the_set_tool,
 	 const Widelands::HeightInterval the_interval =
 	     Widelands::HeightInterval(10, 14))
 		:
-		Editor_Tool(the_set_tool, the_set_tool),
+		EditorTool(the_set_tool, the_set_tool),
 		m_set_tool(the_set_tool),
 		m_interval(the_interval)
 	{}
 
 	int32_t handle_click_impl(Widelands::Map& map,
 	                          const Widelands::World& world,
-	                          Widelands::Node_and_Triangle<> center,
-	                          Editor_Interactive& parent,
-	                          Editor_Action_Args& args) override;
+	                          Widelands::NodeAndTriangle<> center,
+	                          EditorInteractive& parent,
+	                          EditorActionArgs& args) override;
 
 	int32_t handle_undo_impl(Widelands::Map& map,
 	                         const Widelands::World& world,
-	                         Widelands::Node_and_Triangle<> center,
-	                         Editor_Interactive& parent,
-	                         Editor_Action_Args& args) override;
+	                         Widelands::NodeAndTriangle<> center,
+	                         EditorInteractive& parent,
+	                         EditorActionArgs& args) override;
 
-	Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
+	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_noise_height.png";
@@ -59,10 +59,10 @@
 		m_interval = i;
 	}
 
-	Editor_Set_Height_Tool & set_tool() const {return m_set_tool;}
+	EditorSetHeightTool & set_tool() const {return m_set_tool;}
 
 private:
-	Editor_Set_Height_Tool & m_set_tool;
+	EditorSetHeightTool & m_set_tool;
 	Widelands::HeightInterval m_interval;
 };
 

=== modified file 'src/editor/tools/editor_place_bob_tool.cc'
--- src/editor/tools/editor_place_bob_tool.cc	2014-07-20 07:43:07 +0000
+++ src/editor/tools/editor_place_bob_tool.cc	2014-09-18 15:54:00 +0000
@@ -30,11 +30,11 @@
  * Choses an object to place randomly from all enabled
  * and places this on the current field
 */
-int32_t Editor_Place_Bob_Tool::handle_click_impl(Widelands::Map& map,
+int32_t EditorPlaceBobTool::handle_click_impl(Widelands::Map& map,
                                                  const Widelands::World& world,
-                                                 Widelands::Node_and_Triangle<> const center,
-                                                 Editor_Interactive& parent,
-                                                 Editor_Action_Args& args) {
+                                                 Widelands::NodeAndTriangle<> const center,
+                                                 EditorInteractive& parent,
+                                                 EditorActionArgs& args) {
 
 	if (get_nr_enabled() && args.obob_type.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -49,7 +49,7 @@
 	}
 
 	if (!args.nbob_type.empty()) {
-		Widelands::Editor_Game_Base & egbase = parent.egbase();
+		Widelands::EditorGameBase & egbase = parent.egbase();
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
 		 Widelands::Area<Widelands::FCoords>
@@ -70,13 +70,13 @@
 }
 
 int32_t
-Editor_Place_Bob_Tool::handle_undo_impl(Widelands::Map& map,
+EditorPlaceBobTool::handle_undo_impl(Widelands::Map& map,
                                         const Widelands::World&,
-                                        Widelands::Node_and_Triangle<Widelands::Coords> center,
-                                        Editor_Interactive& parent,
-                                        Editor_Action_Args& args) {
+                                        Widelands::NodeAndTriangle<Widelands::Coords> center,
+                                        EditorInteractive& parent,
+                                        EditorActionArgs& args) {
 	if (!args.nbob_type.empty()) {
-		Widelands::Editor_Game_Base & egbase = parent.egbase();
+		Widelands::EditorGameBase & egbase = parent.egbase();
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
 		(map,
 		 Widelands::Area<Widelands::FCoords>
@@ -100,7 +100,7 @@
 		return 0;
 }
 
-Editor_Action_Args Editor_Place_Bob_Tool::format_args_impl(Editor_Interactive & parent)
+EditorActionArgs EditorPlaceBobTool::format_args_impl(EditorInteractive & parent)
 {
-	return Editor_Tool::format_args_impl(parent);
+	return EditorTool::format_args_impl(parent);
 }

=== modified file 'src/editor/tools/editor_place_bob_tool.h'