diff --git a/specs/udmf_zdoom.txt b/specs/udmf_zdoom.txt
index 957a33ce9..ac5ad8eb3 100644
--- a/specs/udmf_zdoom.txt
+++ b/specs/udmf_zdoom.txt
@@ -153,7 +153,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.
       For lines with ACS specials (80-86 and 226), if arg0str is present and non-null, it
       will be used as the name of the script to execute, and arg0 will be ignored.
 
-      lm_sampledist_line = <int>;    // ZDRay customizable sampling distance for this line. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
+      lm_sampledist = <int>;         // ZDRay customizable sampling distance for this line. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_top = <int>;     // ZDRay customizable sampling distance for this line's top part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_mid = <int>;     // ZDRay customizable sampling distance for this line's middle part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_bot = <int>;     // ZDRay customizable sampling distance for this line's bottom part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
@@ -227,7 +227,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.
       colorization_mid = <int>;     // Sets a colorization record for the middle texture. Colorization records must be defined in TEXTURES.
       colorization_bottom = <int>;  // Sets a colorization record for the lower texture. Colorization records must be defined in TEXTURES.
 
-      lm_sampledist_line = <int>;   // ZDRay customizable sampling distance for this sidedef. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
+      lm_sampledist = <int>;        // ZDRay customizable sampling distance for this sidedef. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_top = <int>;    // ZDRay customizable sampling distance for this sidedef's top part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_mid = <int>;    // ZDRay customizable sampling distance for this sidedef's middle part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
       lm_sampledist_bot = <int>;    // ZDRay customizable sampling distance for this sidedef's bottom part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0	  
@@ -368,8 +368,8 @@ Note: All <bool> fields default to false unless mentioned otherwise.
       scale = <float>;          // Vertical and horizontal scaling on thing. Default = 0 (ignored).
       floatbobphase = <int>;    // Sets the thing's floatbobphase. Valid phase values are 0-63. Default = -1 (use actor class default).
 
-      lm_sampledistance = <int>;    // ZDRay lightmap sample distance for the entire map. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 16
-      lm_suncolor = <string>;       // ZDRay lightmap sun color in hex. Default: "FFFFFF"
+      lm_sampledist = <int>;    // ZDRay lightmap sample distance for the entire map. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 16
+      lm_suncolor = <string>;   // ZDRay lightmap sun color in hex. Default: "FFFFFF"
 
       * Note about arg0str
 
diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp
index bb7c22c6e..5c8d9417e 100644
--- a/src/maploader/udmf.cpp
+++ b/src/maploader/udmf.cpp
@@ -765,7 +765,7 @@ public:
 					Level->SunColor = FVector3(float((n >> 16) & 0xFF) / 0xFF, float((n >> 8) & 0xFF) / 0xFF, float(n & 0xFF) / 0xFF);
 				}
 				break;
-			case NAME_lm_sampledistance:
+			case NAME_lm_sampledist:
 				CHECK_N(Zd | Zdt)
 				if (CheckInt(key) >= 0 && CheckInt(key) <= 0xFFFF)
 				{
@@ -773,7 +773,7 @@ public:
 				}
 				else
 				{
-					DPrintf(DMSG_WARNING, "Can't set the global lm_sampledistance to %s\n", key.GetChars());
+					DPrintf(DMSG_WARNING, "Can't set the global lm_sampledist to %s\n", key.GetChars());
 				}
 				break;
 
@@ -1157,7 +1157,7 @@ public:
 				ld->healthgroup = CheckInt(key);
 				break;
 
-			case NAME_lm_sampledist_line:
+			case NAME_lm_sampledist:
 				CHECK_N(Zd | Zdt)
 				for (int i = 0; i < 3; ++i)
 					if (!ld->LightmapSampleDistance[i])
@@ -1521,7 +1521,7 @@ public:
 				CHECK_N(Zd | Zdt)
 				break;
 
-			case NAME_lm_sampledist_line:
+			case NAME_lm_sampledist:
 				CHECK_N(Zd | Zdt)
 				for (int i = 0; i < 3; ++i)
 					if (!sd->textures[i].LightmapSampleDistance)
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index a5604475d..78d9c1a2a 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -849,13 +849,12 @@ xx(Sky)
 xx(Pagename)
 
 // Lightmap/ZDRay keywords
-xx(lm_sampledist_line)
+xx(lm_sampledist)
 xx(lm_sampledist_top)
 xx(lm_sampledist_mid)
 xx(lm_sampledist_bot)
 xx(lm_sampledist_floor)
 xx(lm_sampledist_ceiling)
 xx(lm_suncolor)
-xx(lm_sampledistance)
 
 xx(Corona)