diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index b67342ece4..f3b664f9b4 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -346,7 +346,7 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity)
     xColor hazeGlareColor = _hazeProperties.getHazeGlareColor();
     haze->setDirectionalLightColor(glm::vec3(hazeGlareColor.red / 255.0, hazeGlareColor.green / 255.0, hazeGlareColor.blue / 255.0));
     haze->setHazeEnableGlare(_hazeProperties.getHazeEnableGlare());
-    haze->setDirectionalLightBlend(model::convertDirectionalLightAngleToPower(_hazeProperties.getHazeLightBlendAngle()));
+    haze->setDirectionalLightBlend(model::convertDirectionalLightAngleToPower(_hazeProperties.getHazeGlareAngle()));
 
     float hazeAltitude = _hazeProperties.getHazeCeiling() - _hazeProperties.getHazeBaseRef();
     haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(hazeAltitude));
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 259b6b4935..7ad2f22144 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1159,7 +1159,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare);
-        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_LIGHT_BLEND_ANGLE, Haze, haze, HazeLightBlendAngle, hazeLightBlendAngle);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_GLARE_ANGLE, Haze, haze, HazeGlareAngle, hazeGlareAngle);
 
         ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEfect);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_CEILING, Haze, haze, HazeCeiling, hazeCeiling);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index e9a3b9e9d6..56ec4faa6d 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -238,7 +238,7 @@ enum EntityPropertyList {
     PROP_HAZE_COLOR = PROP_CUTOFF,
     PROP_HAZE_GLARE_COLOR = PROP_EXPONENT,
     PROP_HAZE_ENABLE_GLARE = PROP_IS_SPOTLIGHT,
-    PROP_HAZE_LIGHT_BLEND_ANGLE = PROP_DIFFUSE_COLOR,
+    PROP_HAZE_GLARE_ANGLE = PROP_DIFFUSE_COLOR,
     
     PROP_HAZE_ALTITUDE_EFFECT = PROP_AMBIENT_COLOR_UNUSED,
     PROP_HAZE_CEILING = PROP_SPECULAR_COLOR_UNUSED,
diff --git a/libraries/entities/src/HazePropertyGroup.cpp b/libraries/entities/src/HazePropertyGroup.cpp
index e21f509489..996d2e0cd3 100644
--- a/libraries/entities/src/HazePropertyGroup.cpp
+++ b/libraries/entities/src/HazePropertyGroup.cpp
@@ -18,7 +18,7 @@
 const float HazePropertyGroup::DEFAULT_HAZE_RANGE{ 1000.0f };
 const xColor HazePropertyGroup::DEFAULT_HAZE_COLOR{ 128, 154, 179 };    // Bluish
 const xColor HazePropertyGroup::DEFAULT_HAZE_GLARE_COLOR{ 255, 229, 179 };   // Yellowish
-const float HazePropertyGroup::DEFAULT_HAZE_LIGHT_BLEND_ANGLE{ 20.0 };
+const float HazePropertyGroup::DEFAULT_HAZE_GLARE_ANGLE{ 20.0 };
 
 const float HazePropertyGroup::DEFAULT_HAZE_CEILING{ 200.0f };
 const float HazePropertyGroup::DEFAULT_HAZE_BASE_REF{ 0.0f };
@@ -33,7 +33,7 @@ void HazePropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProp
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare);
-    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_LIGHT_BLEND_ANGLE, Haze, haze, HazeLightBlendAngle, hazeLightBlendAngle);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_GLARE_ANGLE, Haze, haze, HazeGlareAngle, hazeGlareAngle);
 
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEffect);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_CEILING, Haze, haze, HazeCeiling, hazeCeiling);
@@ -51,7 +51,7 @@ void HazePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _d
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeColor, xColor, setHazeColor);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeGlareColor, xColor, setHazeGlareColor);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeEnableGlare, bool, setHazeEnableGlare);
-    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeLightBlendAngle, float, setHazeLightBlendAngle);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeGlareAngle, float, setHazeGlareAngle);
 
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeAltitudeEffect, bool, setHazeAltitudeEffect);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeCeiling, float, setHazeCeiling);
@@ -69,7 +69,7 @@ void HazePropertyGroup::merge(const HazePropertyGroup& other) {
     COPY_PROPERTY_IF_CHANGED(hazeColor);
     COPY_PROPERTY_IF_CHANGED(hazeGlareColor);
     COPY_PROPERTY_IF_CHANGED(hazeEnableGlare);
-    COPY_PROPERTY_IF_CHANGED(hazeLightBlendAngle);
+    COPY_PROPERTY_IF_CHANGED(hazeGlareAngle);
 
     COPY_PROPERTY_IF_CHANGED(hazeAltitudeEffect);
     COPY_PROPERTY_IF_CHANGED(hazeCeiling);
@@ -89,7 +89,7 @@ void HazePropertyGroup::debugDump() const {
     qCDebug(entities) << "            _hazeColor:" << _hazeColor;
     qCDebug(entities) << "            _hazeGlareColor:" << _hazeGlareColor;
     qCDebug(entities) << "            _hazeEnableGlare:" << _hazeEnableGlare;
-    qCDebug(entities) << "            _hazeLightBlendAngle:" << _hazeLightBlendAngle;
+    qCDebug(entities) << "            _hazeGlareAngle:" << _hazeGlareAngle;
 
     qCDebug(entities) << "            _hazeAltitudeEffect:" << _hazeAltitudeEffect;
     qCDebug(entities) << "            _hazeCeiling:" << _hazeCeiling;
@@ -115,8 +115,8 @@ void HazePropertyGroup::listChangedProperties(QList<QString>& out) {
     if (hazeEnableGlareChanged()) {
         out << "haze-hazeEnableGlare";
     }
-    if (hazeLightBlendAngleChanged()) {
-        out << "haze-hazeLightBlendAngle";
+    if (hazeGlareAngleChanged()) {
+        out << "haze-hazeGlareAngle";
     }
 
     if (hazeAltitudeEffectChanged()) {
@@ -157,7 +157,7 @@ bool HazePropertyGroup::appendToEditPacket(OctreePacketData* packetData,
     APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare());
-    APPEND_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, getHazeLightBlendAngle());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, getHazeGlareAngle());
 
     APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_CEILING, getHazeCeiling());
@@ -182,7 +182,7 @@ bool HazePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags,
     READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor);
     READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor);
     READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare);
-    READ_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, float, setHazeLightBlendAngle);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, float, setHazeGlareAngle);
 
     READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect);
     READ_ENTITY_PROPERTY(PROP_HAZE_CEILING, float, setHazeCeiling);
@@ -198,7 +198,7 @@ bool HazePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags,
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_COLOR, HazeColor);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_GLARE_COLOR, HazeGlareColor);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare);
-    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle);
 
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_CEILING, HazeCeiling);
@@ -222,7 +222,7 @@ void HazePropertyGroup::markAllChanged() {
     _hazeColorChanged = true;
     _hazeGlareColorChanged = true;
     _hazeEnableGlareChanged = true;
-    _hazeLightBlendAngleChanged = true;
+    _hazeGlareAngleChanged = true;
 
     _hazeAltitudeEffectChanged = true;
     _hazeCeilingChanged = true;
@@ -242,7 +242,7 @@ EntityPropertyFlags HazePropertyGroup::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_HAZE_COLOR, hazeColor);
     CHECK_PROPERTY_CHANGE(PROP_HAZE_GLARE_COLOR, hazeGlareColor);
     CHECK_PROPERTY_CHANGE(PROP_HAZE_ENABLE_GLARE, hazeEnableGlare);
-    CHECK_PROPERTY_CHANGE(PROP_HAZE_LIGHT_BLEND_ANGLE, hazeLightBlendAngle);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_GLARE_ANGLE, hazeGlareAngle);
 
     CHECK_PROPERTY_CHANGE(PROP_HAZE_ALTITUDE_EFFECT, hazeAltitudeEffect);
     CHECK_PROPERTY_CHANGE(PROP_HAZE_CEILING, hazeCeiling);
@@ -262,7 +262,7 @@ void HazePropertyGroup::getProperties(EntityItemProperties& properties) const {
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeColor, getHazeColor);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeGlareColor, getHazeGlareColor);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeEnableGlare, getHazeEnableGlare);
-    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeLightBlendAngle, getHazeLightBlendAngle);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeGlareAngle, getHazeGlareAngle);
 
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeAltitudeEffect, getHazeAltitudeEffect);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeCeiling, getHazeCeiling);
@@ -282,7 +282,7 @@ bool HazePropertyGroup::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeColor, hazeColor, setHazeColor);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeGlareColor, hazeGlareColor, setHazeGlareColor);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeEnableGlare, hazeEnableGlare, setHazeEnableGlare);
-    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeLightBlendAngle, hazeLightBlendAngle, setHazeLightBlendAngle);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeGlareAngle, hazeGlareAngle, setHazeGlareAngle);
 
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeAltitudeEffect, hazeAltitudeEffect, setHazeAltitudeEffect);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeCeiling, hazeCeiling, setHazeCeiling);
@@ -304,7 +304,7 @@ EntityPropertyFlags HazePropertyGroup::getEntityProperties(EncodeBitstreamParams
     requestedProperties += PROP_HAZE_COLOR;
     requestedProperties += PROP_HAZE_GLARE_COLOR;
     requestedProperties += PROP_HAZE_ENABLE_GLARE;
-    requestedProperties += PROP_HAZE_LIGHT_BLEND_ANGLE;
+    requestedProperties += PROP_HAZE_GLARE_ANGLE;
 
     requestedProperties += PROP_HAZE_CEILING;
     requestedProperties += PROP_HAZE_BASE_REF;
@@ -332,7 +332,7 @@ void HazePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeB
     APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare());
-    APPEND_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, getHazeLightBlendAngle());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, getHazeGlareAngle());
 
     APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect());
     APPEND_ENTITY_PROPERTY(PROP_HAZE_CEILING, getHazeCeiling());
@@ -357,7 +357,7 @@ int HazePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* dat
     READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor);
     READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor);
     READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare);
-    READ_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, float, setHazeLightBlendAngle);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, float, setHazeGlareAngle);
 
     READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect);
     READ_ENTITY_PROPERTY(PROP_HAZE_CEILING, float, setHazeCeiling);
diff --git a/libraries/entities/src/HazePropertyGroup.h b/libraries/entities/src/HazePropertyGroup.h
index 1afd857e5e..cdd36ff7ef 100644
--- a/libraries/entities/src/HazePropertyGroup.h
+++ b/libraries/entities/src/HazePropertyGroup.h
@@ -77,7 +77,7 @@ public:
     static const float DEFAULT_HAZE_RANGE;
     static const xColor DEFAULT_HAZE_COLOR;
     static const xColor DEFAULT_HAZE_GLARE_COLOR;
-    static const float DEFAULT_HAZE_LIGHT_BLEND_ANGLE;
+    static const float DEFAULT_HAZE_GLARE_ANGLE;
 
     static const float DEFAULT_HAZE_CEILING;
     static const float DEFAULT_HAZE_BASE_REF;
@@ -92,7 +92,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_HAZE_COLOR, HazeColor, hazeColor, xColor, DEFAULT_HAZE_COLOR);
     DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_COLOR, HazeGlareColor, hazeGlareColor, xColor, DEFAULT_HAZE_GLARE_COLOR);
     DEFINE_PROPERTY(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare, hazeEnableGlare, bool, false);
-    DEFINE_PROPERTY_REF(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle, hazeLightBlendAngle, float, DEFAULT_HAZE_LIGHT_BLEND_ANGLE);
+    DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle, hazeGlareAngle, float, DEFAULT_HAZE_GLARE_ANGLE);
 
     // Altitude parameters
     DEFINE_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect, hazeAltitudeEffect, bool, false);
diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp
index 764a64b170..077024c3ab 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -365,13 +365,13 @@ bool ZoneEntityItem::getHazeEnableGlare()const {
     return _hazeEnableGlare;
 }
 
-void ZoneEntityItem::setHazeLightBlendAngle(const float hazeLightBlendAngle) {
-    _hazeLightBlendAngle = hazeLightBlendAngle;
+void ZoneEntityItem::setHazeGlareAngle(const float hazeGlareAngle) {
+    _hazeGlareAngle = hazeGlareAngle;
     _hazePropertiesChanged = true;
 }
 
-float ZoneEntityItem::getHazeLightBlendAngle() const {
-    return _hazeLightBlendAngle;
+float ZoneEntityItem::getHazeGlareAngle() const {
+    return _hazeGlareAngle;
 }
 
 void ZoneEntityItem::setHazeCeiling(const float hazeCeiling) {
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index df26b37414..066bd5518f 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -81,8 +81,8 @@ public:
     xColor getHazeGlareColor() const;
     void setHazeEnableGlare(const bool hazeEnableGlare);
     bool getHazeEnableGlare() const;
-    void setHazeLightBlendAngle(const float hazeLightBlendAngle);
-    float getHazeLightBlendAngle() const;
+    void setHazeGlareAngle(const float hazeGlareAngle);
+    float getHazeGlareAngle() const;
 
     void setHazeCeiling(const float hazeCeiling);
     float getHazeCeiling() const;
@@ -152,7 +152,7 @@ protected:
     xColor _hazeColor{ HazePropertyGroup::DEFAULT_HAZE_COLOR };
     xColor _hazeGlareColor{ HazePropertyGroup::DEFAULT_HAZE_GLARE_COLOR };
     bool _hazeEnableGlare{ false };
-    float _hazeLightBlendAngle{ HazePropertyGroup::DEFAULT_HAZE_LIGHT_BLEND_ANGLE };
+    float _hazeGlareAngle{ HazePropertyGroup::DEFAULT_HAZE_GLARE_ANGLE };
 
     float _hazeCeiling{ HazePropertyGroup::DEFAULT_HAZE_CEILING };
     float _hazeBaseRef{ HazePropertyGroup::DEFAULT_HAZE_BASE_REF };
diff --git a/libraries/model/src/model/Haze.h b/libraries/model/src/model/Haze.h
index f6d6488b8d..1bdecc105b 100644
--- a/libraries/model/src/model/Haze.h
+++ b/libraries/model/src/model/Haze.h
@@ -16,7 +16,8 @@
 #include "NumericalConstants.h"
 
 namespace model {
-    const double p_005 = 0.05;
+    const float LOG_P_005 = (float)log(0.05);
+    const float LOG_P_05 = (float)log(0.5);
 
     // Derivation (d is distance, b is haze coefficient, f is attenuation, solve for f = 0.05
     //  f = exp(-d * b)
@@ -24,15 +25,15 @@ namespace model {
     //  b = -ln(f)/d
     inline glm::vec3 convertHazeRangeToHazeRangeFactor(const glm::vec3 hazeRange_m) { 
         return glm::vec3(
-            -(float)log(p_005) / hazeRange_m.x,
-            -(float)log(p_005) / hazeRange_m.y,
-            -(float)log(p_005) / hazeRange_m.z);
+            -LOG_P_005 / hazeRange_m.x,
+            -LOG_P_005 / hazeRange_m.y,
+            -LOG_P_005 / hazeRange_m.z);
     }
 
-    inline float convertHazeRangeToHazeRangeFactor(const float hazeRange_m) { return (-(float)log(p_005) / hazeRange_m); }
+    inline float convertHazeRangeToHazeRangeFactor(const float hazeRange_m) { return (-LOG_P_005 / hazeRange_m); }
 
     inline float convertHazeAltitudeToHazeAltitudeFactor(const float hazeAltitude_m) {
-        return (-(float)log(p_005) / hazeAltitude_m);
+        return -LOG_P_005 / hazeAltitude_m;
     }
 
     // Derivation (s is the proportion of sun blend, a is the angle at which the blend is 50%, solve for m = 0.5
@@ -41,7 +42,7 @@ namespace model {
     //  log(m) = p * log(s)
     //  p = log(m) / log(s)
     inline float convertDirectionalLightAngleToPower(const float directionalLightAngle) {
-        return (float)(log(0.5) / log(cos(RADIANS_PER_DEGREE * directionalLightAngle)));
+        return (float)(LOG_P_05 / log(cos(RADIANS_PER_DEGREE * directionalLightAngle)));
     }
 
     const glm::vec3 initialHazeColor{ 0.5f, 0.6f, 0.7f };
diff --git a/libraries/model/src/model/Stage.h b/libraries/model/src/model/Stage.h
index 4f704effa7..e009684c62 100644
--- a/libraries/model/src/model/Stage.h
+++ b/libraries/model/src/model/Stage.h
@@ -194,8 +194,8 @@ public:
     xColor getHazeGlareColor() const { return _hazeGlareColor; }
     void setHazeEnableGlare(bool hazeEnableGlare) { _hazeEnableGlare = hazeEnableGlare; }
     bool getHazeEnableGlare() const { return _hazeEnableGlare; }
-    void setHazeLightBlendAngle(float hazeLightBlendAngle) { _hazeLightBlendAngle = hazeLightBlendAngle; }
-    float getHazeLightBlendAngle() const { return _hazeLightBlendAngle; }
+    void setHazeGlareAngle(float hazeGlareAngle) { _hazeGlareAngle = hazeGlareAngle; }
+    float getHazeGlareAngle() const { return _hazeGlareAngle; }
 
     void setHazeAltitudeEffect(bool hazeAltitudeEffect) { _hazeAltitudeEffect = hazeAltitudeEffect; }
     bool getHazeAltitudeEffect() const { return _hazeAltitudeEffect; }
@@ -223,7 +223,7 @@ protected:
     xColor _hazeColor;
     xColor _hazeGlareColor;
     bool _hazeEnableGlare;
-    float _hazeLightBlendAngle;
+    float _hazeGlareAngle;
 
     bool _hazeAltitudeEffect;
     float _hazeCeiling;
diff --git a/libraries/script-engine/src/SceneScriptingInterface.cpp b/libraries/script-engine/src/SceneScriptingInterface.cpp
index 233ecc8b15..58741f9271 100644
--- a/libraries/script-engine/src/SceneScriptingInterface.cpp
+++ b/libraries/script-engine/src/SceneScriptingInterface.cpp
@@ -173,11 +173,11 @@ void SceneScripting::Stage::setHazeEnableGlare(const bool hazeEnableGlare) {
 bool SceneScripting::Stage::getHazeEnableGlare() const {
     return _skyStage->getHazeEnableGlare();
 }
-void SceneScripting::Stage::setHazeLightBlendAngle(const float hazeLightBlendAngle) {
-    _skyStage->setHazeLightBlendAngle(hazeLightBlendAngle);
+void SceneScripting::Stage::setHazeGlareAngle(const float hazeGlareAngle) {
+    _skyStage->setHazeGlareAngle(hazeGlareAngle);
 }
-float SceneScripting::Stage::getHazeLightBlendAngle() const {
-    return _skyStage->getHazeLightBlendAngle();
+float SceneScripting::Stage::getHazeGlareAngle() const {
+    return _skyStage->getHazeGlareAngle();
 }
 
 void SceneScripting::Stage::setHazeAltitudeEffect(const bool hazeAltitudeEffect) {
diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h
index f19e565450..791390236a 100644
--- a/libraries/script-engine/src/SceneScriptingInterface.h
+++ b/libraries/script-engine/src/SceneScriptingInterface.h
@@ -141,9 +141,9 @@ namespace SceneScripting {
         void setHazeEnableGlare(bool value);
         bool getHazeEnableGlare() const;
 
-        Q_PROPERTY(float hazeLightBlendAngle READ getHazeLightBlendAngle WRITE setHazeLightBlendAngle)
-        void setHazeLightBlendAngle(float value);
-        float getHazeLightBlendAngle() const;
+        Q_PROPERTY(float hazeGlareAngle READ getHazeGlareAngle WRITE setHazeGlareAngle)
+        void setHazeGlareAngle(float value);
+        float getHazeGlareAngle() const;
 
         Q_PROPERTY(bool hazeAltitudeEffect READ getHazeAltitudeEffect WRITE setHazeAltitudeEffect)
         void setHazeAltitudeEffect(bool value);
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 494c47b4a6..a0fa5549af 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -692,7 +692,7 @@ function loaded() {
         var elZoneHazeGlareColorGreen = document.getElementById("property-zone-haze-blend-out-color-green");
         var elZoneHazeGlareColorBlue = document.getElementById("property-zone-haze-blend-out-color-blue");
         var elZoneHazeEnableGlare = document.getElementById("property-zone-haze-enable-light-blend");
-        var elZoneHazeLightBlendAngle = document.getElementById("property-zone-haze-blend-angle");
+        var elZonehazeGlareAngle = document.getElementById("property-zone-haze-blend-angle");
         
         var elZoneHazeAltitudeEffect = document.getElementById("property-zone-haze-altitude-effect");
         var elZoneHazeBaseRef = document.getElementById("property-zone-haze-base");
@@ -1071,7 +1071,7 @@ function loaded() {
                             elZoneHazeGlareColorBlue.value = properties.haze.hazeGlareColor.blue;
 
                             elZoneHazeEnableGlare.checked = properties.haze.hazeEnableGlare;
-                            elZoneHazeLightBlendAngle.value = properties.haze.hazeLightBlendAngle.toFixed(0);
+                            elZonehazeGlareAngle.value = properties.haze.hazeGlareAngle.toFixed(0);
 
                             elZoneHazeAltitudeEffect.checked = properties.haze.hazeAltitudeEffect;
                             elZoneHazeBaseRef.value = properties.haze.hazeBaseRef.toFixed(0);
@@ -1540,7 +1540,7 @@ function loaded() {
         elZoneHazeGlareColorBlue.addEventListener('change', zoneHazeGlareColorChangeFunction);
 
         elZoneHazeEnableGlare.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeEnableGlare'));
-        elZoneHazeLightBlendAngle.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeLightBlendAngle'));
+        elZonehazeGlareAngle.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeGlareAngle'));
 
         elZoneHazeAltitudeEffect.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAltitudeEffect'));
         elZoneHazeCeiling.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeCeiling'));