diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 6fee2638c3..b386c9d4b7 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -34,14 +34,15 @@ template <typename T>
 class NumericalProperty : public TemplateProperty<T> {
 public:
     NumericalProperty(std::string identifier, std::string guiName,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
     NumericalProperty(std::string identifier, std::string guiName, T value,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
     NumericalProperty(std::string identifier, std::string guiName, T value,
-        T minimumValue, T maximumValue, Visibility visibility = Visibility::User);
+        T minimumValue, T maximumValue,
+        Property::Visibility visibility = Property::Visibility::User);
     NumericalProperty(std::string identifier, std::string guiName, T value,
         T minimumValue, T maximumValue, T steppingValue,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
 
     bool getLuaValue(lua_State* state) const override;
     bool setLuaValue(lua_State* state) override;
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index a16ba6a2c5..89a47f9b66 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -234,7 +234,7 @@ const std::string NumericalProperty<T>::SteppingValueKey = "SteppingValue";
         
 template <typename T>
 NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
-                                        Visibility visibility)
+                                        Property::Visibility visibility)
     : NumericalProperty<T>(
         std::move(identifier), std::move(guiName),
         PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>(),
@@ -248,7 +248,7 @@ NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiN
 template <typename T>
 NumericalProperty<T>::NumericalProperty(std::string identifier,
                                         std::string guiName, T value,
-                                        Visibility visibility)
+                                        Property::Visibility visibility)
     : NumericalProperty<T>(
         std::move(identifier), std::move(guiName), std::move(value),
         PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
@@ -261,7 +261,7 @@ NumericalProperty<T>::NumericalProperty(std::string identifier,
 template <typename T>
 NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
                                         T value, T minimumValue, T maximumValue,
-                                        Visibility visibility)
+                                        Property::Visibility visibility)
     : NumericalProperty<T>(
         std::move(identifier) , std::move(guiName), std::move(value),
         std::move(minimumValue), std::move(maximumValue),
@@ -274,7 +274,7 @@ template <typename T>
 NumericalProperty<T>::NumericalProperty(std::string identifier,
                                         std::string guiName, T value,
                                         T minimumValue, T maximumValue, T steppingValue,
-                                        Visibility visibility)
+                                        Property::Visibility visibility)
     : TemplateProperty<T>(std::move(identifier), std::move(guiName), std::move(value),
                           visibility)
     , _minimumValue(std::move(minimumValue))
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index 19d831cd22..2a1ae50d4d 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -62,7 +62,7 @@ public:
      * \param guiName The GUI name that should be used to represent this property
      */
     OptionProperty(std::string identifier, std::string guiName, 
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
 
     /**
     * The constructor delegating the <code>identifier</code> and the <code>guiName</code>
@@ -72,7 +72,7 @@ public:
     * \param displayType Optional DisplayType for GUI (default RADIO)
     */
     OptionProperty(std::string identifier, std::string guiName, DisplayType displayType,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
 
     /**
      * Returns the name of the class for reflection purposes.
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index dedcab1544..ad2cafc4f4 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -40,7 +40,7 @@ public:
     };
 
     SelectionProperty(std::string identifier, std::string guiName,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
     
     void addOption(Option option);
     void removeOptions();
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index 3e0970d1aa..efc8423e28 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -64,7 +64,7 @@ public:
      * \param guiName The human-readable GUI name for this TemplateProperty
      */
     TemplateProperty(std::string identifier, std::string guiName,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Visibility::User);
 
     /**
      * The constructor initializing the TemplateProperty with the provided
@@ -72,7 +72,7 @@ public:
      * <code>value</code>.
      */
     TemplateProperty(std::string identifier, std::string guiName, T value,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Visibility::User);
 
     /**
      * Returns the class name for this TemplateProperty. The default implementation makes
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 02e8de3e9e..bacccfafe6 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -150,21 +150,20 @@ namespace properties {
 
 template <typename T>
 TemplateProperty<T>::TemplateProperty(std::string identifier, std::string guiName,
-                                      Visibility visibility)
+                                      Property::Visibility visibility)
     : TemplateProperty<T>(
             std::move(identifier), std::move(guiName),
             PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>(),
             visibility)
-
 {
 }
 
 template <typename T>
 TemplateProperty<T>::TemplateProperty(std::string identifier, std::string guiName,
-                                      T value, Visibility visibility)
+                                      T value, Property::Visibility visibility)
     : Property(std::move(identifier), std::move(guiName), visibility)
-    , _value(std::move(value)) {
-}
+    , _value(std::move(value))
+{}
 
 template <typename T>
 std::string TemplateProperty<T>::className() const {
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index 904039784b..f7f1aa4594 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -43,7 +43,7 @@ public:
      * \param guiName The human-readable name of this Property
      */
     TriggerProperty(std::string identifier, std::string guiName,
-        Visibility visibility = Visibility::User);
+        Property::Visibility visibility = Property::Visibility::User);
 
     /**
      * Returns the class name <code>TriggerProperty</code>.
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 84b33373c3..8c24ba9036 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -34,13 +34,13 @@ namespace properties {
 const std::string OptionProperty::OptionsKey = "Options";
 
 OptionProperty::OptionProperty(std::string identifier, std::string guiName,
-                               Visibility visibility)
+                               Property::Visibility visibility)
     : IntProperty(std::move(identifier), std::move(guiName), visibility)
     , _displayType(DisplayType::Radio)
 {}
 
 OptionProperty::OptionProperty(std::string identifier, std::string guiName,
-                               DisplayType displayType, Visibility visibility)
+                               DisplayType displayType, Property::Visibility visibility)
     : IntProperty(std::move(identifier), std::move(guiName), visibility)
     , _displayType(displayType)
 {}
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 486aa35506..1049d62e77 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -36,7 +36,7 @@ namespace properties {
 const std::string SelectionProperty::OptionsKey = "Options";
 
 SelectionProperty::SelectionProperty(std::string identifier, std::string guiName,
-                                     Visibility visibility)
+                                     Property::Visibility visibility)
     : TemplateProperty(std::move(identifier), std::move(guiName), std::vector<int>(),
                        visibility)
 {}
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index 75ec76c376..9f40a36345 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -28,7 +28,7 @@ namespace openspace {
 namespace properties {
 
 TriggerProperty::TriggerProperty(std::string identifier, std::string guiName,
-                                 Visibility visibility)
+                                 Property::Visibility visibility)
     : Property(std::move(identifier), std::move(guiName), visibility)
 {}