diff --git a/src/tools/minimap.rs b/src/tools/minimap.rs
index 0ad761a7..8ec9da8f 100644
--- a/src/tools/minimap.rs
+++ b/src/tools/minimap.rs
@@ -4,7 +4,6 @@ use std::collections::HashSet;
 use ndarray::Axis;
 
 use dm::objtree::*;
-use dm::objtree::subpath as subtype;
 use dm::constants::Constant;
 use dmm::{Map, Grid, Prefab};
 use dmi::Image;
@@ -79,7 +78,7 @@ pub fn generate(ctx: Context, icon_cache: &IconCache) -> Result<Image, ()> {
 
                 // icons which differ from their map states
                 let p = &atom.type_.path;
-                if subtype(p, "/turf/closed/mineral/") {
+                if subpath(p, "/turf/closed/mineral/") {
                     atom.sprite.ofs_x -= 4;
                     atom.sprite.ofs_y -= 4;
                 }
diff --git a/src/tools/render_passes/mod.rs b/src/tools/render_passes/mod.rs
index fcadc44a..6ba2eebb 100644
--- a/src/tools/render_passes/mod.rs
+++ b/src/tools/render_passes/mod.rs
@@ -403,28 +403,27 @@ fn unary_aboveground(atom: &Atom, objtree: &ObjectTree) -> Option<&'static str>
 }
 
 fn fancy_layer_for_path(p: &str) -> Option<Layer> {
-    use dm::objtree::subpath as subtype;
-    Some(if subtype(p, "/turf/open/floor/plating/") || subtype(p, "/turf/open/space/") {
+    Some(if subpath(p, "/turf/open/floor/plating/") || subpath(p, "/turf/open/space/") {
         Layer::from(-10)  // under everything
-    } else if subtype(p, "/turf/closed/mineral/") {
+    } else if subpath(p, "/turf/closed/mineral/") {
         Layer::from(-3)   // above hidden stuff and plating but below walls
-    } else if subtype(p, "/turf/open/floor/") || subtype(p, "/turf/closed/") {
+    } else if subpath(p, "/turf/open/floor/") || subpath(p, "/turf/closed/") {
         Layer::from(-2)   // above hidden pipes and wires
-    } else if subtype(p, "/turf/") {
+    } else if subpath(p, "/turf/") {
         Layer::from(-10)  // under everything
-    } else if subtype(p, "/obj/effect/turf_decal/") {
+    } else if subpath(p, "/obj/effect/turf_decal/") {
         Layer::from(-1)   // above turfs
-    } else if subtype(p, "/obj/structure/disposalpipe/") {
+    } else if subpath(p, "/obj/structure/disposalpipe/") {
         Layer::from(-6)
-    } else if subtype(p, "/obj/machinery/atmospherics/pipe/") && !p.contains("visible") {
+    } else if subpath(p, "/obj/machinery/atmospherics/pipe/") && !p.contains("visible") {
         Layer::from(-5)
-    } else if subtype(p, "/obj/structure/cable/") {
+    } else if subpath(p, "/obj/structure/cable/") {
         Layer::from(-4)
-    } else if subtype(p, "/obj/machinery/power/terminal/") {
+    } else if subpath(p, "/obj/machinery/power/terminal/") {
         Layer::from(-3.5)
-    } else if subtype(p, "/obj/structure/lattice/") {
+    } else if subpath(p, "/obj/structure/lattice/") {
         Layer::from(-8)
-    } else if subtype(p, "/obj/machinery/navbeacon/") {
+    } else if subpath(p, "/obj/machinery/navbeacon/") {
         Layer::from(-3)
     } else {
         return None