diff --git a/src/formula/callable_objects.cpp b/src/formula/callable_objects.cpp
index 359d9e275a9d..a772a8e2fc50 100644
--- a/src/formula/callable_objects.cpp
+++ b/src/formula/callable_objects.cpp
@@ -375,7 +375,7 @@ variant unit_type_callable::get_value(const std::string& key) const
 	} else if(key == "type") {
 		return variant(u_.type_name());
 	} else if(key == "alignment") {
-		return variant(unit_type::ALIGNMENT::enum_to_string(u_.alignment()));
+		return variant(u_.alignment().to_string());
 	} else if(key == "race") {
 		return variant(u_.race_id());
 	} else if(key == "abilities") {
diff --git a/src/game_board.cpp b/src/game_board.cpp
index acc9d9cc4330..5c16542d4d02 100644
--- a/src/game_board.cpp
+++ b/src/game_board.cpp
@@ -207,10 +207,10 @@ void game_board::side_drop_to(int side_num, team::CONTROLLER ctrl, team::PROXY_C
 	tm.change_proxy(proxy);
 	tm.set_local(true);
 
-	tm.set_current_player(team::CONTROLLER::enum_to_string(ctrl) + std::to_string(side_num));
+	tm.set_current_player(ctrl.to_string() + std::to_string(side_num));
 
 	unit_map::iterator leader = units_.find_leader(side_num);
-	if (leader.valid()) leader->rename(team::CONTROLLER::enum_to_string(ctrl) + std::to_string(side_num));
+	if (leader.valid()) leader->rename(ctrl.to_string() + std::to_string(side_num));
 }
 
 void game_board::side_change_controller(int side_num, bool is_local, const std::string& pname) {
diff --git a/src/game_classification.cpp b/src/game_classification.cpp
index 42f8046d867d..2f220f93a189 100644
--- a/src/game_classification.cpp
+++ b/src/game_classification.cpp
@@ -96,7 +96,7 @@ config game_classification::to_config() const
 
 	cfg["label"] = label;
 	cfg["version"] = game_config::version;
-	cfg["campaign_type"] = game_classification::CAMPAIGN_TYPE::enum_to_string(campaign_type);
+	cfg["campaign_type"] = campaign_type.to_string();
 	cfg["campaign_define"] = campaign_define;
 	cfg["campaign_extra_defines"] = utils::join(campaign_xtra_defines);
 	cfg["scenario_define"] = scenario_define;
diff --git a/src/reports.cpp b/src/reports.cpp
index 5a5b77eef8e2..9a63cb80a9cc 100644
--- a/src/reports.cpp
+++ b/src/reports.cpp
@@ -336,7 +336,7 @@ static config unit_alignment(reports::context & rc, const unit* u)
 	if (!u) return config();
 	std::ostringstream str, tooltip;
 	const std::string align = unit_type::alignment_description(u->alignment(), u->gender());
-	const std::string align_id = unit_type::ALIGNMENT::enum_to_string(u->alignment());
+	const std::string align_id = u->alignment().to_string();
 	int cm = combat_modifier(rc.units(), rc.map(), rc.screen().displayed_unit_hex(), u->alignment(),
 			u->is_fearless());
 
diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp
index 686b2ed6c19a..df98a6ae3928 100644
--- a/src/scripting/game_lua_kernel.cpp
+++ b/src/scripting/game_lua_kernel.cpp
@@ -1551,7 +1551,7 @@ int game_lua_kernel::impl_game_config_get(lua_State *L)
 	const mp_game_settings& mp_settings = play_controller_.get_mp_settings();
 	const game_classification & classification = play_controller_.get_classification();
 
-	return_string_attrib("campaign_type", game_classification::CAMPAIGN_TYPE::enum_to_string(classification.campaign_type));
+	return_string_attrib("campaign_type", classification.campaign_type.to_string());
 	if(classification.campaign_type==game_classification::CAMPAIGN_TYPE::MULTIPLAYER) {
 		return_cfgref_attrib("mp_settings", mp_settings.to_config());
 		return_cfgref_attrib("era", game_config_manager::get()->game_config().find_child("era","id",mp_settings.mp_era));
diff --git a/src/units/types.cpp b/src/units/types.cpp
index 9dd610466acd..d458abc6a6d7 100644
--- a/src/units/types.cpp
+++ b/src/units/types.cpp
@@ -836,9 +836,9 @@ std::string unit_type::alignment_description(ALIGNMENT align, unit_race::GENDER
 	std::string str = std::string();
 	if (gender == unit_race::FEMALE) {
 		ALIGNMENT_FEMALE_VARIATION fem = align.cast<ALIGNMENT_FEMALE_VARIATION::type>();
-		str = ALIGNMENT_FEMALE_VARIATION::enum_to_string(fem);
+		str = fem.to_string();
 	} else {
-		str = ALIGNMENT::enum_to_string(align);
+		str = align.to_string();
 	}
 	return translation::sgettext(str.c_str());
 }