diff --git a/code/__defines/__renderer.dm b/code/__defines/__renderer.dm
index bb2d2507f20a4..004e752f3310b 100644
--- a/code/__defines/__renderer.dm
+++ b/code/__defines/__renderer.dm
@@ -66,7 +66,7 @@
 	#define ABOVE_TILE_LAYER            2.05
 	#define EXPOSED_PIPE_LAYER          2.06
 	#define EXPOSED_WIRE_LAYER          2.07
-	#define EXPOSED_WIRE_TERMINAL_LAYER 2.08
+	#define ABOVE_EXPOSED_WIRE_LAYER    2.08
 	#define CATWALK_LAYER               2.09
 	#define ABOVE_CATWALK_LAYER         2.10
 	#define BLOOD_LAYER                 2.11
diff --git a/code/game/machinery/teleporter/beacon.dm b/code/game/machinery/teleporter/beacon.dm
index 6ba4dae0678a0..562ee031a05ee 100644
--- a/code/game/machinery/teleporter/beacon.dm
+++ b/code/game/machinery/teleporter/beacon.dm
@@ -13,6 +13,7 @@ var/global/const/TELEBEACON_WIRE_SIGNALLER = 4
 	active_power_usage = 50
 	anchored = TRUE
 	level = ATOM_LEVEL_UNDER_TILE
+	layer = ABOVE_EXPOSED_WIRE_LAYER
 	obj_flags = OBJ_FLAG_ANCHORABLE
 
 	machine_name = "teleporter beacon"
diff --git a/code/modules/atmospherics/components/binary_devices/circulator.dm b/code/modules/atmospherics/components/binary_devices/circulator.dm
index 55c2b986c6491..3bb48ca0d355f 100644
--- a/code/modules/atmospherics/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/components/binary_devices/circulator.dm
@@ -7,7 +7,9 @@
 	icon = 'icons/obj/machines/power/teg.dmi'
 	icon_state = "circ-unassembled"
 	anchored = FALSE
-	layer = ABOVE_CATWALK_LAYER
+
+	layer = STRUCTURE_LAYER
+
 
 	var/kinetic_efficiency = 0.04 //combined kinetic and kinetic-to-electric efficiency
 	var/volume_ratio = 0.2
diff --git a/code/modules/atmospherics/components/binary_devices/oxyregenerator.dm b/code/modules/atmospherics/components/binary_devices/oxyregenerator.dm
index d85d25a04cc71..c7bab29219663 100644
--- a/code/modules/atmospherics/components/binary_devices/oxyregenerator.dm
+++ b/code/modules/atmospherics/components/binary_devices/oxyregenerator.dm
@@ -12,7 +12,9 @@
 	construct_state = /singleton/machine_construction/default/panel_closed
 	uncreated_component_parts = null
 	stat_immune = 0
-	layer = ABOVE_CATWALK_LAYER
+
+	layer = STRUCTURE_LAYER
+
 
 	machine_name = "oxygen regenerator"
 	machine_desc = "Catalyzes gaseous CO2 to convert it into gaseous oxygen. The excess carbon is condensed and ejected as graphite sheets."
diff --git a/code/modules/atmospherics/components/unary/cold_sink.dm b/code/modules/atmospherics/components/unary/cold_sink.dm
index 7ece1933e0b06..dcf38b69949b0 100644
--- a/code/modules/atmospherics/components/unary/cold_sink.dm
+++ b/code/modules/atmospherics/components/unary/cold_sink.dm
@@ -14,6 +14,7 @@
 	construct_state = /singleton/machine_construction/default/panel_closed
 	uncreated_component_parts = null
 	stat_immune = 0
+	layer = STRUCTURE_LAYER
 
 	machine_name = "gas cooling system"
 	machine_desc = "While active, this machine cools the gas in a connected pipeline to lower temperatures. Gas pressure decreases with chilling, allowing it to be compressed more easily."
diff --git a/code/modules/atmospherics/components/unary/heat_source.dm b/code/modules/atmospherics/components/unary/heat_source.dm
index 0c862441ea066..afcf97deb63d8 100644
--- a/code/modules/atmospherics/components/unary/heat_source.dm
+++ b/code/modules/atmospherics/components/unary/heat_source.dm
@@ -14,6 +14,7 @@
 	construct_state = /singleton/machine_construction/default/panel_closed
 	uncreated_component_parts = null
 	stat_immune = 0
+	layer = STRUCTURE_LAYER
 
 	machine_name = "gas heating system"
 	machine_desc = "While active, this machine increases the temperature of a connected gas line to the configured amount. Gas pressure increases with heat."
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index 9fa1367a7144a..addf4d81e3a95 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -9,7 +9,7 @@
 	icon_state = "term"
 	desc = "It's an underfloor wiring terminal for power equipment."
 	level = ATOM_LEVEL_UNDER_TILE
-	layer = EXPOSED_WIRE_TERMINAL_LAYER
+	layer = ABOVE_EXPOSED_WIRE_LAYER
 	var/obj/item/stock_parts/power/terminal/master
 	anchored = TRUE