diff --git a/Nasal/weather_scenario.nas b/Nasal/weather_scenario.nas
index 737120e9c..fa174f0ba 100644
--- a/Nasal/weather_scenario.nas
+++ b/Nasal/weather_scenario.nas
@@ -42,17 +42,17 @@ setlistener("/environment/weather-scenario", func(n) {
         setprop( "/environment/params/metar-updates-environment", 0 );
         setprop( "/environment/realwx/enabled", 0 );
         setprop( "/environment/config/enabled", 0 );
-        setprop( "/environment/climate/is-isa", 0 );
+        setprop( "/environment/atmosphere/is-isa", 0 );
     } else if( scenarioName == "Live data" ) {
         setprop( "/environment/params/metar-updates-environment", 1 );
         setprop( "/environment/realwx/enabled", 1 );
         setprop( "/environment/config/enabled", 1 );
-        setprop( "/environment/climate/is-isa", 0 );
+        setprop( "/environment/atmosphere/is-isa", 0 );
     } else if( scenarioName == "Manual input" ) {
         setprop( "/environment/params/metar-updates-environment", 1 );
         setprop( "/environment/realwx/enabled", 0 );
         setprop( "/environment/config/enabled", 1 );
-        setprop( "/environment/climate/is-isa", 0 );
+        setprop( "/environment/atmosphere/is-isa", 0 );
     } else {
         setprop( "/environment/params/metar-updates-environment", 1 );
         setprop( "/environment/realwx/enabled", 0 );
@@ -61,6 +61,6 @@ setlistener("/environment/weather-scenario", func(n) {
         setprop( "environment/metar/data", metar );
 
         var isISA = scenarioName == "International Standard Atmosphere";
-        setprop( "/environment/climate/is-isa", isISA );
+        setprop( "/environment/atmosphere/is-isa", isISA );
     }
 });
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 290700625..318438fd2 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -55,16 +55,16 @@
             setprop( "/environment/params/metar-updates-environment", 0 );
             setprop( "/environment/realwx/enabled", 0 );
             setprop( "/environment/config/enabled", 1 );
-            setprop( "/environment/climate/is-isa", 0 );
+            setprop( "/environment/atmosphere/is-isa", 0 );
           } else if( scenarioName == "Live data" ) {
             # If we've selected Live Data we need to force
             # a refresh of the Live Data setting.
             setprop( "/environment/realwx/enabled", 1 );
-            setprop( "/environment/climate/is-isa", 0 );
+            setprop( "/environment/atmosphere/is-isa", 0 );
           } else if( scenarioName == "International Standard Atmosphere" ) {
             # If we've selected International Standard Atmosphere we need to
             # enable the ISA setting.
-            setprop( "/environment/climate/is-isa", 1 );
+            setprop( "/environment/atmosphere/is-isa", 1 );
           }
         },