diff --git a/code/modules/mapping/map_helpers/paint.dm b/code/modules/mapping/map_helpers/paint.dm
index c1e32bf4bfd..f38b43f788f 100644
--- a/code/modules/mapping/map_helpers/paint.dm
+++ b/code/modules/mapping/map_helpers/paint.dm
@@ -39,35 +39,35 @@
 
 	qdel(src)
 
-#define CREATE_WALL_PAINT(x, c)	/obj/map_helper/paint/x/color=c
+#define CREATE_PAINT_HELPER(x, c)	/obj/map_helper/paint/x/color=c
 
-CREATE_WALL_PAINT(beastybrown, COLOR_CARGO_BROWN)
-CREATE_WALL_PAINT(pipecyan, COLOR_ATMOSPHERICS_CYAN)
-CREATE_WALL_PAINT(sun, COLOR_SUN)
-CREATE_WALL_PAINT(red, COLOR_RED)
-CREATE_WALL_PAINT(silver, COLOR_SILVER)
-CREATE_WALL_PAINT(black, COLOR_GRAY20)
-CREATE_WALL_PAINT(green, COLOR_GREEN)
-CREATE_WALL_PAINT(navy, COLOR_NAVY)
-CREATE_WALL_PAINT(eggshell, COLOR_EGGSHELL)
-CREATE_WALL_PAINT(beige, COLOR_BEIGE)
-CREATE_WALL_PAINT(darkred, COLOR_SECURITY_RED)
-CREATE_WALL_PAINT(maroon, COLOR_MAROON)
-CREATE_WALL_PAINT(cyanblue, COLOR_CYAN_BLUE)
-CREATE_WALL_PAINT(copper, COLOR_COPPER)
-CREATE_WALL_PAINT(amber, COLOR_AMBER)
-CREATE_WALL_PAINT(wallgunmetal, COLOR_WALL_GUNMETAL)
-CREATE_WALL_PAINT(bottlegreen, COLOR_BOTTLE_GREEN)
-CREATE_WALL_PAINT(palebottlegreen, COLOR_PALE_BTL_GREEN)
-CREATE_WALL_PAINT(pakistangreen, COLOR_PAKISTAN_GREEN)
-CREATE_WALL_PAINT(offwhite, COLOR_OFF_WHITE)
-CREATE_WALL_PAINT(violet, COLOR_EXPLO_VIOLET)
-CREATE_WALL_PAINT(gunmetal, COLOR_GUNMETAL)
-CREATE_WALL_PAINT(paleorange, COLOR_PALE_ORANGE)
-CREATE_WALL_PAINT(commandblue, COLOR_COMMAND_BLUE)
-CREATE_WALL_PAINT(purple, COLOR_PURPLE)
-CREATE_WALL_PAINT(purplegray, COLOR_PURPLE_GRAY)
-CREATE_WALL_PAINT(babyblue, COLOR_BABY_BLUE)
-CREATE_WALL_PAINT(hardwood, WOOD_COLOR_HARDWOOD)
+CREATE_PAINT_HELPER(beastybrown, COLOR_CARGO_BROWN)
+CREATE_PAINT_HELPER(pipecyan, COLOR_ATMOSPHERICS_CYAN)
+CREATE_PAINT_HELPER(sun, COLOR_SUN)
+CREATE_PAINT_HELPER(red, COLOR_RED)
+CREATE_PAINT_HELPER(silver, COLOR_SILVER)
+CREATE_PAINT_HELPER(black, COLOR_GRAY20)
+CREATE_PAINT_HELPER(green, COLOR_GREEN)
+CREATE_PAINT_HELPER(navy, COLOR_NAVY)
+CREATE_PAINT_HELPER(eggshell, COLOR_EGGSHELL)
+CREATE_PAINT_HELPER(beige, COLOR_BEIGE)
+CREATE_PAINT_HELPER(darkred, COLOR_SECURITY_RED)
+CREATE_PAINT_HELPER(maroon, COLOR_MAROON)
+CREATE_PAINT_HELPER(cyanblue, COLOR_CYAN_BLUE)
+CREATE_PAINT_HELPER(copper, COLOR_COPPER)
+CREATE_PAINT_HELPER(amber, COLOR_AMBER)
+CREATE_PAINT_HELPER(wallgunmetal, COLOR_WALL_GUNMETAL)
+CREATE_PAINT_HELPER(bottlegreen, COLOR_BOTTLE_GREEN)
+CREATE_PAINT_HELPER(palebottlegreen, COLOR_PALE_BTL_GREEN)
+CREATE_PAINT_HELPER(pakistangreen, COLOR_PAKISTAN_GREEN)
+CREATE_PAINT_HELPER(offwhite, COLOR_OFF_WHITE)
+CREATE_PAINT_HELPER(violet, COLOR_EXPLO_VIOLET)
+CREATE_PAINT_HELPER(gunmetal, COLOR_GUNMETAL)
+CREATE_PAINT_HELPER(paleorange, COLOR_PALE_ORANGE)
+CREATE_PAINT_HELPER(commandblue, COLOR_COMMAND_BLUE)
+CREATE_PAINT_HELPER(purple, COLOR_PURPLE)
+CREATE_PAINT_HELPER(purplegray, COLOR_PURPLE_GRAY)
+CREATE_PAINT_HELPER(babyblue, COLOR_BABY_BLUE)
+CREATE_PAINT_HELPER(hardwood, WOOD_COLOR_HARDWOOD)
 
-#undef CREATE_WALL_PAINT
+#undef CREATE_PAINT_HELPER
diff --git a/code/modules/mapping/map_helpers/paint_stripe.dm b/code/modules/mapping/map_helpers/paint_stripe.dm
index f4fa5f5c308..1f824c4d564 100644
--- a/code/modules/mapping/map_helpers/paint_stripe.dm
+++ b/code/modules/mapping/map_helpers/paint_stripe.dm
@@ -39,34 +39,34 @@
 
 	qdel(src)
 
-#define CREATE_PAINT_STRIPE(x, c)	/obj/map_helper/paint_stripe/x/color=c
+#define CREATE_PAINT_STRIPE_HELPER(x, c)	/obj/map_helper/paint_stripe/x/color=c
 
-CREATE_PAINT_STRIPE(beastybrown, COLOR_CARGO_BROWN)
-CREATE_PAINT_STRIPE(sun, COLOR_SUN)
-CREATE_PAINT_STRIPE(red, COLOR_RED)
-CREATE_PAINT_STRIPE(silver, COLOR_SILVER)
-CREATE_PAINT_STRIPE(black, COLOR_GRAY20)
-CREATE_PAINT_STRIPE(green, COLOR_GREEN)
-CREATE_PAINT_STRIPE(navy, COLOR_NAVY)
-CREATE_PAINT_STRIPE(eggshell, COLOR_EGGSHELL)
-CREATE_PAINT_STRIPE(beige, COLOR_BEIGE)
-CREATE_PAINT_STRIPE(darkred, COLOR_SECURITY_RED)
-CREATE_PAINT_STRIPE(maroon, COLOR_MAROON)
-CREATE_PAINT_STRIPE(cyanblue, COLOR_CYAN_BLUE)
-CREATE_PAINT_STRIPE(copper, COLOR_COPPER)
-CREATE_PAINT_STRIPE(amber, COLOR_AMBER)
-CREATE_PAINT_STRIPE(wallgunmetal, COLOR_WALL_GUNMETAL)
-CREATE_PAINT_STRIPE(bottlegreen, COLOR_BOTTLE_GREEN)
-CREATE_PAINT_STRIPE(palebottlegreen, COLOR_PALE_BTL_GREEN)
-CREATE_PAINT_STRIPE(pakistangreen, COLOR_PAKISTAN_GREEN)
-CREATE_PAINT_STRIPE(offwhite, COLOR_OFF_WHITE)
-CREATE_PAINT_STRIPE(violet, COLOR_EXPLO_VIOLET)
-CREATE_PAINT_STRIPE(gunmetal, COLOR_GUNMETAL)
-CREATE_PAINT_STRIPE(paleorange, COLOR_PALE_ORANGE)
-CREATE_PAINT_STRIPE(commandblue, COLOR_COMMAND_BLUE)
-CREATE_PAINT_STRIPE(purple, COLOR_PURPLE)
-CREATE_PAINT_STRIPE(purplegray, COLOR_PURPLE_GRAY)
-CREATE_PAINT_STRIPE(babyblue, COLOR_BABY_BLUE)
-CREATE_PAINT_STRIPE(pipecyan, COLOR_ATMOSPHERICS_CYAN)
+CREATE_PAINT_STRIPE_HELPER(beastybrown, COLOR_CARGO_BROWN)
+CREATE_PAINT_STRIPE_HELPER(sun, COLOR_SUN)
+CREATE_PAINT_STRIPE_HELPER(red, COLOR_RED)
+CREATE_PAINT_STRIPE_HELPER(silver, COLOR_SILVER)
+CREATE_PAINT_STRIPE_HELPER(black, COLOR_GRAY20)
+CREATE_PAINT_STRIPE_HELPER(green, COLOR_GREEN)
+CREATE_PAINT_STRIPE_HELPER(navy, COLOR_NAVY)
+CREATE_PAINT_STRIPE_HELPER(eggshell, COLOR_EGGSHELL)
+CREATE_PAINT_STRIPE_HELPER(beige, COLOR_BEIGE)
+CREATE_PAINT_STRIPE_HELPER(darkred, COLOR_SECURITY_RED)
+CREATE_PAINT_STRIPE_HELPER(maroon, COLOR_MAROON)
+CREATE_PAINT_STRIPE_HELPER(cyanblue, COLOR_CYAN_BLUE)
+CREATE_PAINT_STRIPE_HELPER(copper, COLOR_COPPER)
+CREATE_PAINT_STRIPE_HELPER(amber, COLOR_AMBER)
+CREATE_PAINT_STRIPE_HELPER(wallgunmetal, COLOR_WALL_GUNMETAL)
+CREATE_PAINT_STRIPE_HELPER(bottlegreen, COLOR_BOTTLE_GREEN)
+CREATE_PAINT_STRIPE_HELPER(palebottlegreen, COLOR_PALE_BTL_GREEN)
+CREATE_PAINT_STRIPE_HELPER(pakistangreen, COLOR_PAKISTAN_GREEN)
+CREATE_PAINT_STRIPE_HELPER(offwhite, COLOR_OFF_WHITE)
+CREATE_PAINT_STRIPE_HELPER(violet, COLOR_EXPLO_VIOLET)
+CREATE_PAINT_STRIPE_HELPER(gunmetal, COLOR_GUNMETAL)
+CREATE_PAINT_STRIPE_HELPER(paleorange, COLOR_PALE_ORANGE)
+CREATE_PAINT_STRIPE_HELPER(commandblue, COLOR_COMMAND_BLUE)
+CREATE_PAINT_STRIPE_HELPER(purple, COLOR_PURPLE)
+CREATE_PAINT_STRIPE_HELPER(purplegray, COLOR_PURPLE_GRAY)
+CREATE_PAINT_STRIPE_HELPER(babyblue, COLOR_BABY_BLUE)
+CREATE_PAINT_STRIPE_HELPER(pipecyan, COLOR_ATMOSPHERICS_CYAN)
 
-#undef CREATE_PAINT_STRIPE
+#undef CREATE_PAINT_STRIPE_HELPER
diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm
index c2bc34ff4b9..1d456d8f032 100644
--- a/code/modules/mapping/spawner/window.dm
+++ b/code/modules/mapping/spawner/window.dm
@@ -59,7 +59,7 @@
 			if(locate(/obj/structure/wall_frame) in loc)
 				CRASH("Window spawner at [audit_loc()] is set to spawn low wall but found one already in turf")
 			var/obj/structure/wall_frame/low_wall = new low_wall_path(loc)
-			if(isnull(low_wall_stripe_color))
+			if(!isnull(low_wall_stripe_color))
 				low_wall.stripe_color = low_wall_stripe_color
 
 		var/new_window = new window_full_path(loc)