diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp
index 82f9ed502c..951ea95d49 100644
--- a/src/maploader/udmf.cpp
+++ b/src/maploader/udmf.cpp
@@ -753,14 +753,6 @@ public:
 				th->friendlyseeblocks = CheckInt(key);
 				break;
 
-			case NAME_lightintensity:
-			case NAME_suncolor:
-			case NAME_sampledistance:
-			case NAME_bounces:
-			case NAME_gridsize:
-				CHECK_N(Zd | Zdt)
-				break;
-
 			default:
 				CHECK_N(Zd | Zdt)
 				if (0 == strnicmp("user_", key.GetChars(), 5))
@@ -1131,9 +1123,9 @@ public:
 				ld->healthgroup = CheckInt(key);
 				break;
 
-			case NAME_Lightcolor:
-			case NAME_lightintensity:
-			case NAME_lightdistance:
+			case NAME_lightcolorline:
+			case NAME_lightintensityline:
+			case NAME_lightdistanceline:
 				CHECK_N(Zd | Zdt)
 				break;
 
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index 5bd305525f..1ca25a1f12 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -850,16 +850,12 @@ xx(Sky)
 xx(Pagename)
 
 // Lightmap keywords
-//xx(lightcolor) // already defined
-xx(lightintensity)
-xx(lightdistance)
+xx(lightcolorline)
+xx(lightintensityline)
+xx(lightdistanceline)
 xx(lightcolorfloor)
 xx(lightintensityfloor)
 xx(lightdistancefloor)
 xx(lightcolorceiling)
 xx(lightintensityceiling)
 xx(lightdistanceceiling)
-xx(suncolor)
-xx(sampledistance)
-xx(bounces)
-xx(gridsize)