Index: Constructor/Operations/ExportAirfields.cs
===================================================================
--- Constructor/Operations/ExportAirfields.cs   (revision 6378)
+++ Constructor/Operations/ExportAirfields.cs   (working copy)
@@ -85,7 +85,10 @@

                 var airfieldDir = appEnv.terrainConfig.AirfieldsDir.AbsoluteByRelativeTcons();

-                var airfieldLua = System.IO.Path.Combine(airfieldDir, airfield.name + ".extra.cfg.lua");
+                var oldAirfieldLua = System.IO.Path.Combine(airfieldDir, airfield.name + ".extra.cfg.lua");
+                var airfieldLua = System.IO.Path.Combine(airfieldDir, airfield.name + ".extra2.cfg.lua");
+                System.IO.File.Delete(oldAirfieldLua);
+                System.IO.File.Delete(airfieldLua);

                 command = new Command();
                 command.EdtuCommand = "build-airfield";
Index: Constructor/Operations/TerrainConfig.cs
===================================================================
--- Constructor/Operations/TerrainConfig.cs (revision 6378)
+++ Constructor/Operations/TerrainConfig.cs (working copy)
@@ -1267,13 +1267,6 @@
 ");

             var airfields = AppEnv.Instance.Project.Airfields;
-            for (int i = 0; i != airfields.Count; ++i)
-            {
-                if (!airfields[i].Enabled)
-                    continue;
-                b.AppendLine(airfields[i].name + " = " + (i+1));
-            }
-            b.AppendLine();

             b.AppendLine("Airdromes = {}");
             b.AppendLine();
@@ -1290,7 +1283,7 @@
                     continue;

                 var path = AirfieldsDirRelativeToTerrainCfg + airfield.name + ".cfg.lua";
-                var additionalPath = AirfieldsDirRelativeToTerrainCfg + airfield.name + ".extra.cfg.lua";
+                var additionalPath = AirfieldsDirRelativeToTerrainCfg + airfield.name + ".extra2.cfg.lua";
                 path = path.Unix();
                 additionalPath = additionalPath.Unix();

@@ -1330,7 +1323,7 @@

                 var airfieldLua = System.IO.Path.Combine(airfieldDir, airfield.name + ".cfg.lua");

-                b.AppendLine("Airdromes[" + airfield.name + "] = {");
+                b.AppendLine("Airdromes[\"" + airfield.name + "\"] = {");

                 b.AppendLine(string.Format("\tcode = \"{0}\",", airfieldData.Code));
                 b.AppendLine(string.Format("\tclass = \"{0}\",", airfieldData.Class));