diff --git a/src/landscape/C4Scenario.cpp b/src/landscape/C4Scenario.cpp
index f1426c912..e5f256702 100644
--- a/src/landscape/C4Scenario.cpp
+++ b/src/landscape/C4Scenario.cpp
@@ -182,9 +182,9 @@ void C4SHead::CompileFunc(StdCompiler *pComp, bool fSection)
 	if (!fSection)
 	{
 		pComp->Value(mkNamingAdapt(Icon,                      "Icon",                 18));
-		pComp->Value(mkNamingAdapt(Title,                     "Title",                "Default Title"));
-		pComp->Value(mkNamingAdapt(Loader,                    "Loader",               ""));
-		pComp->Value(mkNamingAdapt(Font,                      "Font",                 ""));
+		pComp->Value(mkNamingAdapt(mkStringAdaptA(Title),     "Title",                "Default Title"));
+		pComp->Value(mkNamingAdapt(mkStringAdaptA(Loader),    "Loader",               ""));
+		pComp->Value(mkNamingAdapt(mkStringAdaptA(Font),      "Font",                 ""));
 		pComp->Value(mkNamingAdapt(mkArrayAdaptDM(C4XVer,0),  "Version"               ));
 		pComp->Value(mkNamingAdapt(Difficulty,                "Difficulty",           0));
 		pComp->Value(mkNamingAdapt(MaxPlayer,                 "MaxPlayer",            C4S_MaxPlayerDefault));
@@ -198,8 +198,8 @@ void C4SHead::CompileFunc(StdCompiler *pComp, bool fSection)
 	pComp->Value(mkNamingAdapt(RandomSeed,                "RandomSeed",           0));
 	if (!fSection)
 	{
-		pComp->Value(mkNamingAdapt(Engine,                    "Engine",               ""));
-		pComp->Value(mkNamingAdapt(MissionAccess,             "MissionAccess", ""));
+		pComp->Value(mkNamingAdapt(mkStringAdaptA(Engine),    "Engine",               ""));
+		pComp->Value(mkNamingAdapt(mkStringAdaptA(MissionAccess),"MissionAccess",     ""));
 		pComp->Value(mkNamingAdapt(Secret,                    "Secret",               false));
 		pComp->Value(mkNamingAdapt(NetworkGame,               "NetworkGame",          false));
 		pComp->Value(mkNamingAdapt(NetworkRuntimeJoin,        "NetworkRuntimeJoin",   false));
@@ -330,7 +330,7 @@ void C4SLandscape::CompileFunc(StdCompiler *pComp)
 	pComp->Value(mkNamingAdapt(VegLevel,                "VegetationLevel",       C4SVal(50,30,0,100), true));
 	pComp->Value(mkNamingAdapt(InEarth,                 "InEarth",               C4IDList()));
 	pComp->Value(mkNamingAdapt(InEarthLevel,            "InEarthLevel",          C4SVal(50,0,0,100), true));
-	pComp->Value(mkNamingAdapt(mkStringAdapt(SkyDef, StdCompiler::RCT_All),"Sky",""));
+	pComp->Value(mkNamingAdapt(mkStringAdaptA(SkyDef),  "Sky",                   ""));
 	pComp->Value(mkNamingAdapt(mkArrayAdaptDM(SkyDefFade,0),"SkyFade"            ));
 	pComp->Value(mkNamingAdapt(BottomOpen,              "BottomOpen",            0));
 	pComp->Value(mkNamingAdapt(TopOpen,                 "TopOpen",               1));
@@ -344,8 +344,8 @@ void C4SLandscape::CompileFunc(StdCompiler *pComp)
 	pComp->Value(mkNamingAdapt(Phase,                   "Phase",                 C4SVal(50)));
 	pComp->Value(mkNamingAdapt(Period,                  "Period",                C4SVal(15)));
 	pComp->Value(mkNamingAdapt(Random,                  "Random",                C4SVal(0)));
-	pComp->Value(mkNamingAdapt(Material,                "Material",             "Earth"));
-	pComp->Value(mkNamingAdapt(Liquid,                  "Liquid",                "Water"));
+	pComp->Value(mkNamingAdapt(mkStringAdaptA(Material),"Material",              "Earth"));
+	pComp->Value(mkNamingAdapt(mkStringAdaptA(Liquid),  "Liquid",                "Water"));
 	pComp->Value(mkNamingAdapt(LiquidLevel,             "LiquidLevel",           C4SVal()));
 	pComp->Value(mkNamingAdapt(MapPlayerExtend,         "MapPlayerExtend",       0));
 	pComp->Value(mkNamingAdapt(Layers,                  "Layers",                C4NameList()));
diff --git a/src/lib/StdAdaptors.h b/src/lib/StdAdaptors.h
index 10088f943..d1223bded 100644
--- a/src/lib/StdAdaptors.h
+++ b/src/lib/StdAdaptors.h
@@ -206,6 +206,8 @@ struct StdStdStringAdapt
 };
 inline StdStdStringAdapt mkStringAdapt(std::string& string, StdCompiler::RawCompileType eRawType = StdCompiler::RCT_Escaped)
 { return StdStdStringAdapt(string, eRawType); }
+inline StdStdStringAdapt mkStringAdaptA(std::string& string)
+{ return StdStdStringAdapt(string, StdCompiler::RCT_All); }
 
 // * Raw adaptor
 struct StdRawAdapt