diff --git a/src/draw.rs b/src/draw.rs
index 66e7a61..25b0a2b 100644
--- a/src/draw.rs
+++ b/src/draw.rs
@@ -43,8 +43,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         self.guide().segbend_head(from).into()
     }
 
-    #[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 1))]
-    #[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 1))]
+    #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     pub fn finish_in_dot(
         &mut self,
         head: Head,
@@ -58,8 +58,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         let head = self
             .extend_head(head, tangent.start_point())
             .map_err(|err| DrawException::CannotFinishIn(into, err.into()))?;
-        let layer = head.face().primitive(self.layout.layout()).layer();
-        let maybe_net = head.face().primitive(self.layout.layout()).maybe_net();
+        let layer = head.face().primitive(self.layout.drawing()).layer();
+        let maybe_net = head.face().primitive(self.layout.drawing()).maybe_net();
 
         match head.face() {
             DotIndex::Fixed(dot) => {
@@ -92,8 +92,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         Ok::<(), DrawException>(())
     }
 
-    #[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))]
-    #[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
+    #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     pub fn segbend_around_dot(
         &mut self,
         head: Head,
@@ -137,8 +137,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         ))
     }
 
-    #[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))]
-    #[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
+    #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     pub fn segbend_around_bend(
         &mut self,
         head: Head,
@@ -182,8 +182,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         ))
     }
 
-    #[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))]
-    #[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
+    #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     fn segbend_around(
         &mut self,
         head: Head,
@@ -198,7 +198,7 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         self.segbend(head, around, to, cw, width, offset)
     }
 
-    #[debug_ensures(self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     fn extend_head(&mut self, head: Head, to: Point) -> Result<Head, Infringement> {
         if let Head::Segbend(head) = head {
             self.layout.move_dot(head.face.into(), to)?;
@@ -208,8 +208,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         }
     }
 
-    #[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))]
-    #[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
+    #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     fn segbend(
         &mut self,
         head: Head,
@@ -219,8 +219,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         width: f64,
         offset: f64,
     ) -> Result<SegbendHead, LayoutException> {
-        let layer = head.face().primitive(self.layout.layout()).layer();
-        let maybe_net = head.face().primitive(self.layout.layout()).maybe_net();
+        let layer = head.face().primitive(self.layout.drawing()).layer();
+        let maybe_net = head.face().primitive(self.layout.drawing()).maybe_net();
         let segbend = self.layout.insert_segbend(
             head.face(),
             around,
@@ -248,19 +248,19 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
         Ok::<SegbendHead, LayoutException>(SegbendHead {
             face: self
                 .layout
-                .layout()
+                .drawing()
                 .primitive(segbend.bend)
                 .other_joint(segbend.dot),
             segbend,
         })
     }
 
-    #[debug_ensures(ret.is_some() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() - 4))]
-    #[debug_ensures(ret.is_none() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))]
+    #[debug_ensures(ret.is_some() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() - 4))]
+    #[debug_ensures(ret.is_none() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
     pub fn undo_segbend(&mut self, head: SegbendHead) -> Option<Head> {
         let prev_dot = self
             .layout
-            .layout()
+            .drawing()
             .primitive(head.segbend.seg)
             .other_joint(head.segbend.dot.into());
 
@@ -269,6 +269,6 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
     }
 
     fn guide(&self) -> Guide<R> {
-        Guide::new(self.layout.layout())
+        Guide::new(self.layout.drawing())
     }
 }
diff --git a/src/layout/layout.rs b/src/layout/layout.rs
index 2e19058..1220600 100644
--- a/src/layout/layout.rs
+++ b/src/layout/layout.rs
@@ -107,7 +107,7 @@ impl<R: RulesTrait> Layout<R> {
         0.0
     }
 
-    pub fn layout(&self) -> &Drawing<R> {
+    pub fn drawing(&self) -> &Drawing<R> {
         &self.drawing
     }
 
diff --git a/src/router.rs b/src/router.rs
index 2c4dedc..3f5e27e 100644
--- a/src/router.rs
+++ b/src/router.rs
@@ -119,13 +119,13 @@ impl<'a, RO: RouterObserverTrait<R>, R: RulesTrait> AstarStrategy<&Mesh, f64>
     fn estimate_cost(&mut self, vertex: VertexIndex) -> f64 {
         self.observer.on_estimate(&self.tracer, vertex);
         let start_point = PrimitiveIndex::from(vertex)
-            .primitive(self.tracer.layout.layout())
+            .primitive(self.tracer.layout.drawing())
             .shape()
             .center();
         let end_point = self
             .tracer
             .layout
-            .layout()
+            .drawing()
             .primitive(self.to)
             .shape()
             .center();
@@ -148,8 +148,8 @@ impl<R: RulesTrait> Router<R> {
         // XXX: Should we actually store the mesh? May be useful for debugging, but doesn't look
         // right.
         //self.mesh.triangulate(&self.layout)?;
-        let mut mesh = Mesh::new(self.layout.layout());
-        mesh.generate(self.layout.layout())
+        let mut mesh = Mesh::new(self.layout.drawing());
+        mesh.generate(self.layout.drawing())
             .map_err(|err| RoutingError {
                 from,
                 to,