diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf
index 51ffd14b49..0cff31e9d2 100644
--- a/addons/goggles/XEH_postInit.sqf
+++ b/addons/goggles/XEH_postInit.sqf
@@ -49,7 +49,7 @@ FUNC(CheckGlasses) = {
 player addEventHandler ["Explosion", {
     private "_effects";
     if (alive ace_player) then {
-        call FUNC(ApplyDirtEffect);
+        call FUNC(ApplyDirt);
         if (GETBROKEN) exitWith {};
         if (((_this select 1) call FUNC(GetExplosionIndex)) < getNumber(ConfigFile >> "CfgGlasses" >> GVAR(Current) >> "ACE_Resistance")) exitWith {};
         if !([ace_player] call FUNC(isGogglesVisible)) exitWith {["GlassesCracked",[ace_player]] call EFUNC(common,localEvent);};
@@ -90,7 +90,7 @@ player AddEventHandler ["Put", {call FUNC(checkGlasses);}];
     if (call FUNC(ExternalCamera)) exitWith {call FUNC(RemoveGlassesEffect)};
 
     if ([ace_player] call FUNC(isGogglesVisible)) then {
-        [_this select 0] call FUNC(applyGlassesEffect);
+        [_this select 0] call FUNC(applyGlasses);
     } else {
         call FUNC(removeGlassesEffect);
     };
diff --git a/addons/goggles/XEH_preInit.sqf b/addons/goggles/XEH_preInit.sqf
index c6fa4e12b2..1a1222b4a1 100644
--- a/addons/goggles/XEH_preInit.sqf
+++ b/addons/goggles/XEH_preInit.sqf
@@ -7,9 +7,9 @@ PREP(handleFired);
 PREP(handleKilled);
 
 
-PREP(applyDirtEffect);
+PREP(applyDirt);
 PREP(applyDust);
-PREP(applyGlassesEffect);
+PREP(applyGlasses);
 
 PREP(checkGoggles);
 PREP(clearGlasses);
diff --git a/addons/goggles/functions/fnc_applyDirtEffect.sqf b/addons/goggles/functions/fnc_applyDirt.sqf
similarity index 93%
rename from addons/goggles/functions/fnc_applyDirtEffect.sqf
rename to addons/goggles/functions/fnc_applyDirt.sqf
index 068f7639d2..87f140b91d 100644
--- a/addons/goggles/functions/fnc_applyDirtEffect.sqf
+++ b/addons/goggles/functions/fnc_applyDirt.sqf
@@ -9,7 +9,7 @@
  * Succeeded <BOOL>
  *
  * Example:
- * _applied = call ace_goggles_fnc_ApplyDirtEffect;
+ * _applied = call ace_goggles_fnc_ApplyDirt;
  *
  * Public: Yes
  */
diff --git a/addons/goggles/functions/fnc_applyGlassesEffect.sqf b/addons/goggles/functions/fnc_applyGlasses.sqf
similarity index 94%
rename from addons/goggles/functions/fnc_applyGlassesEffect.sqf
rename to addons/goggles/functions/fnc_applyGlasses.sqf
index 7abb10d448..e524a503a6 100644
--- a/addons/goggles/functions/fnc_applyGlassesEffect.sqf
+++ b/addons/goggles/functions/fnc_applyGlasses.sqf
@@ -11,7 +11,7 @@
  * None
  *
  * Example:
- * [goggles ace_player] call ace_goggles_fnc_ApplyGlassesEffect;
+ * [goggles ace_player] call ace_goggles_fnc_ApplyGlasses
  *
  * Public: No
  */
@@ -46,7 +46,7 @@ if (_glassImagePath != "") then {
 };
 
 if GETDIRT then {
-    call FUNC(applyDirtEffect);
+    call FUNC(applyDirt);
 };
 
 if GETDUSTT(DACTIVE) then {
diff --git a/addons/goggles/functions/fnc_checkGoggles.sqf b/addons/goggles/functions/fnc_checkGoggles.sqf
index 84b86c3da4..0587469f02 100644
--- a/addons/goggles/functions/fnc_checkGoggles.sqf
+++ b/addons/goggles/functions/fnc_checkGoggles.sqf
@@ -35,7 +35,7 @@ if (true) then {
         };
     };
     if !(GVAR(EffectsActive)) then {
-        [goggles ace_player] call FUNC(applyGlassesEffect);
+        [goggles ace_player] call FUNC(applyGlasses);
     } else {
         if ([goggles ace_player] call FUNC(isDivingGoggles) && {underwater ace_player}) then {
             call FUNC(removeRainEffect);
diff --git a/addons/goggles/functions/fnc_dustHandler.sqf b/addons/goggles/functions/fnc_dustHandler.sqf
index 07d1bded75..2f23f69afb 100644
--- a/addons/goggles/functions/fnc_dustHandler.sqf
+++ b/addons/goggles/functions/fnc_dustHandler.sqf
@@ -28,7 +28,7 @@ private ["_position", "_particleConfig", "_cloudType", "_surface", "_bullets"];
 // check if the unit really is on the ground and not in a building
 _position = getPosATL _unit;
 
-if (_position select 2 > 0.2) exitWith {};
+if (_position select 2 > 0.2) exitWith {true};
 
 // get weapon dust effect
 _particleConfig = configFile >> "CfgWeapons" >> _weapon >> "GunParticles";
@@ -57,7 +57,7 @@ if (_surface != GVAR(surfaceCache)) then {
 };
 
 // quit if surface isn't dusty
-if (!GVAR(surfaceCacheIsDust)) exitWith {};
+if (!GVAR(surfaceCacheIsDust)) exitWith {true};
 
 // increment dust value with type bullet
 _bullets = GETDUSTT(DBULLETS);