diff --git a/src/kiri/mode/cam/op-drill.js b/src/kiri/mode/cam/op-drill.js
index b97428be..ca495175 100644
--- a/src/kiri/mode/cam/op-drill.js
+++ b/src/kiri/mode/cam/op-drill.js
@@ -47,7 +47,7 @@ class OpDrill extends CamOp {
             slice.camLines = [poly];
 
             slice.output()
-                .setLayer("drill", { face: color, line: color })
+                .setLayer(state.layername, { face: color, line: color })
                 .addPolys(slice.camLines);
             addSlices(slice);
             sliceOut.push(slice);
diff --git a/src/kiri/mode/cam/op-outline.js b/src/kiri/mode/cam/op-outline.js
index c9b7e275..99e6a034 100644
--- a/src/kiri/mode/cam/op-outline.js
+++ b/src/kiri/mode/cam/op-outline.js
@@ -212,7 +212,7 @@ class OpOutline extends CamOp {
                 .setLayer("slice", {line: 0xaaaa00}, false)
                 .addPolys(slice.topPolys())
             slice.output()
-                .setLayer("outline", {face: color, line: color})
+                .setLayer(state.layername, {face: color, line: color})
                 .addPolys(slice.camLines);
         }
 
diff --git a/src/kiri/mode/cam/op-pocket.js b/src/kiri/mode/cam/op-pocket.js
index b3b19b2b..68000d37 100644
--- a/src/kiri/mode/cam/op-pocket.js
+++ b/src/kiri/mode/cam/op-pocket.js
@@ -135,7 +135,7 @@ class OpPocket extends CamOp {
                         });
                     }
                     slice.output()
-                        .setLayer("pocket", {line: color}, false)
+                        .setLayer(state.layername, {line: color}, false)
                         .addPolys(slice.camLines)
                     if (debug && shadow) slice.output()
                         .setLayer("pocket shadow", {line: 0xff8811}, false)
diff --git a/src/kiri/mode/cam/op-rough.js b/src/kiri/mode/cam/op-rough.js
index beb24827..6f247b10 100644
--- a/src/kiri/mode/cam/op-rough.js
+++ b/src/kiri/mode/cam/op-rough.js
@@ -65,7 +65,7 @@ class OpRough extends CamOp {
                 }
                 slice.camLines = polys;
                 slice.output()
-                    .setLayer("roughing", {face: color, line: color})
+                    .setLayer(state.layername, {face: color, line: color})
                     .addPolys(slice.camLines);
                 addSlices(slice);
                 camFaces.push(slice);
@@ -279,7 +279,7 @@ class OpRough extends CamOp {
 
         slices.forEach(slice => {
             slice.output()
-                .setLayer("roughing", {face: color, line: color})
+                .setLayer(state.layername, {face: color, line: color})
                 .addPolys(slice.camLines);
         });
         this.sliceOut = slices.filter(slice => slice.camLines);
diff --git a/src/kiri/mode/cam/op-trace.js b/src/kiri/mode/cam/op-trace.js
index 52481169..c38b646b 100644
--- a/src/kiri/mode/cam/op-trace.js
+++ b/src/kiri/mode/cam/op-trace.js
@@ -92,7 +92,7 @@ class OpTrace extends CamOp {
             }
             POLY.setWinding(slice.camLines, offset === "outside" ? !cutdir : cutdir, false);
             slice.output()
-                .setLayer("trace follow", {line: color}, false)
+                .setLayer(state.layername, {line: color}, false)
                 .addPolys(slice.camLines)
         }
         function clearZnew(polys, z, down) {
@@ -154,7 +154,7 @@ class OpTrace extends CamOp {
                         .setLayer("trace poly", {line: 0x1188ff}, false)
                         .addPolys([ poly ])
                     slice.output()
-                        .setLayer("trace", {line: color}, false)
+                        .setLayer(state.layername, {line: color}, false)
                         .addPolys(slice.camLines)
                     progress(zpro, "trace");
                     zpro += zinc;
diff --git a/src/kiri/mode/cam/slice.js b/src/kiri/mode/cam/slice.js
index eec8f94d..1f39e461 100644
--- a/src/kiri/mode/cam/slice.js
+++ b/src/kiri/mode/cam/slice.js
@@ -310,8 +310,11 @@ export async function cam_slice(settings, widget, onupdate, ondone) {
             workover.bottom_z = isIndexed ? valz.ov_botz : bottom_stock + valz.ov_botz;
             workover.bottom_cut = Math.max(workover.bottom_z, -zThru);
         }
-        // state.workarea = workover;
+        let { note, type } = op.op;
+        let named = note ? note.split(' ').filter(v => v.charAt(0) === '#') : [];
+        let layername = named.length ? named : (note ? `${type} (${note})` : type);
         Object.assign(state, {
+            layername,
             zBottom,
             zThru,
             ztOff,