diff --git a/src/interface/modeler/AtmosphereModeler.cpp b/src/interface/modeler/AtmosphereModeler.cpp
index 0b75562..4412dd9 100644
--- a/src/interface/modeler/AtmosphereModeler.cpp
+++ b/src/interface/modeler/AtmosphereModeler.cpp
@@ -6,7 +6,7 @@
 #include "DefinitionNode.h"
 #include "ModelerCameras.h"
 
-AtmosphereModeler::AtmosphereModeler(MainModelerWindow *main) : BaseModelerTool(main) {
+AtmosphereModeler::AtmosphereModeler(MainModelerWindow *ui) : BaseModelerTool(ui) {
     addFloatBinding("atmosphere_humidity", "value", "/atmosphere/humidity");
     addFloatBinding("atmosphere_sun_direction", "phi", "/atmosphere/sun/phi", true);
     addFloatBinding("atmosphere_sun_direction", "theta", "/atmosphere/sun/theta", true);
@@ -15,7 +15,7 @@ AtmosphereModeler::AtmosphereModeler(MainModelerWindow *main) : BaseModelerTool(
     addFloatBinding("atmosphere_moon_direction", "theta", "/atmosphere/moon/theta", true);
     // addFloatBinding("atmosphere_moon_radius", "value", "/atmosphere/moon/radius");
 
-    main->setQmlProperty("atmosphere_daytime", "value", main->getScenery()->getAtmosphere()->getDaytime());
+    ui->setQmlProperty("atmosphere_daytime", "value", ui->getScenery()->getAtmosphere()->getDaytime());
 }
 
 void AtmosphereModeler::nodeChanged(const DefinitionNode *node, const DefinitionDiff *) {
diff --git a/src/interface/modeler/AtmosphereModeler.h b/src/interface/modeler/AtmosphereModeler.h
index 810c425..7527876 100644
--- a/src/interface/modeler/AtmosphereModeler.h
+++ b/src/interface/modeler/AtmosphereModeler.h
@@ -10,7 +10,7 @@ namespace modeler {
 
 class AtmosphereModeler : protected BaseModelerTool {
   public:
-    AtmosphereModeler(MainModelerWindow *window);
+    AtmosphereModeler(MainModelerWindow *ui);
 
     virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff) override;
 };
diff --git a/src/interface/modeler/BaseModelerTool.cpp b/src/interface/modeler/BaseModelerTool.cpp
index 716cf36..0de7811 100644
--- a/src/interface/modeler/BaseModelerTool.cpp
+++ b/src/interface/modeler/BaseModelerTool.cpp
@@ -14,19 +14,19 @@ class BaseModelerTool::pimpl {
     vector<unique_ptr<FloatPropertyBind>> float_bindings;
 };
 
-BaseModelerTool::BaseModelerTool(MainModelerWindow *main) : impl(new pimpl), window(main) {
+BaseModelerTool::BaseModelerTool(MainModelerWindow *ui) : impl(new pimpl), ui(ui) {
 }
 
 BaseModelerTool::~BaseModelerTool() {
 }
 
 void BaseModelerTool::addIntBinding(const string &object, const string &property, const string &path, bool monitor) {
-    auto node = static_cast<IntNode *>(window->getScenery()->findByPath(path));
+    auto node = static_cast<IntNode *>(ui->getScenery()->findByPath(path));
     if (node) {
-        impl->int_bindings.push_back(make_unique<IntPropertyBind>(window, object, property, node));
+        impl->int_bindings.push_back(make_unique<IntPropertyBind>(ui, object, property, node));
 
         if (monitor) {
-            startWatching(window->getScenery(), path, false);
+            startWatching(ui->getScenery(), path, false);
         }
     } else {
         Logs::error("UI") << "Can't find int node for binding : " << path << endl;
@@ -34,12 +34,12 @@ void BaseModelerTool::addIntBinding(const string &object, const string &property
 }
 
 void BaseModelerTool::addFloatBinding(const string &object, const string &property, const string &path, bool monitor) {
-    auto node = static_cast<FloatNode *>(window->getScenery()->findByPath(path));
+    auto node = static_cast<FloatNode *>(ui->getScenery()->findByPath(path));
     if (node) {
-        impl->float_bindings.push_back(make_unique<FloatPropertyBind>(window, object, property, node));
+        impl->float_bindings.push_back(make_unique<FloatPropertyBind>(ui, object, property, node));
 
         if (monitor) {
-            startWatching(window->getScenery(), path, false);
+            startWatching(ui->getScenery(), path, false);
         }
     } else {
         Logs::error("UI") << "Can't find float node for binding : " << path << endl;
diff --git a/src/interface/modeler/BaseModelerTool.h b/src/interface/modeler/BaseModelerTool.h
index 25bffee..d6c9406 100644
--- a/src/interface/modeler/BaseModelerTool.h
+++ b/src/interface/modeler/BaseModelerTool.h
@@ -12,7 +12,7 @@ namespace modeler {
 
 class BaseModelerTool : public DefinitionWatcher {
   public:
-    BaseModelerTool(MainModelerWindow *window);
+    BaseModelerTool(MainModelerWindow *ui);
     virtual ~BaseModelerTool();
 
     /**
@@ -31,14 +31,14 @@ class BaseModelerTool : public DefinitionWatcher {
 
   protected:
     inline MainModelerWindow *getWindow() const {
-        return window;
+        return ui;
     }
 
   private:
     class pimpl;
     unique_ptr<pimpl> impl;
 
-    MainModelerWindow *window;
+    MainModelerWindow *ui;
 };
 }
 }