diff --git a/examples/EnviroPlus/scad/main.scad b/examples/EnviroPlus/scad/main.scad
index ba2afc70..41db72cd 100644
--- a/examples/EnviroPlus/scad/main.scad
+++ b/examples/EnviroPlus/scad/main.scad
@@ -353,7 +353,7 @@ assembly("RPI") {
     pcb_grid(rpi, 9.5, 0.5, -0.6)
         rotate(180)
             explode(20)
-                pin_header(2p54header, 20, 2, right_angle = true);
+                pin_header(header2p54, 20, 2, right_angle = true);
 }
 
 //! 1. Solvent weld or glue the bulkhead into the recess in the bottom of the case.
diff --git a/examples/PT_camera/PT_camera.scad b/examples/PT_camera/PT_camera.scad
index a4a287df..fe4adb74 100644
--- a/examples/PT_camera/PT_camera.scad
+++ b/examples/PT_camera/PT_camera.scad
@@ -6,7 +6,7 @@ use <../../vitamins/pcb.scad>
 module ptc(ang2) {
   rotate([180,0,0])
     union(){
-      geared_stepper(28BYJ_48,ang2);
+      geared_stepper(step_28BYJ_48,ang2);
       rotate([90,0,180-ang2])
         translate([9.8,-16.5,1.7])
           rotate([0,0,90])
@@ -15,7 +15,7 @@ module ptc(ang2) {
 }
 
 module pt(ang,ang2) {
-  rotate([180,0,0]) geared_stepper(28BYJ_48,ang);
+  rotate([180,0,0]) geared_stepper(step_28BYJ_48,ang);
   rotate([0,0,ang]) rotate([270,0,0]) translate([0,-29.0,-1.5]) ptc(ang2);
 }
 
diff --git a/scripts/update_project.sh b/scripts/update_project.sh
new file mode 100755
index 00000000..0502049b
--- /dev/null
+++ b/scripts/update_project.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if [ "$1" = "--for-real" ]
+then
+	command='sed -i'
+	extra=''
+elif [ "$1" = "--help" ]
+then
+	echo "Update variable names in your project"
+	echo "defaults to dry run, use --for-real to run for real"
+	echo "it is not safe to run twice on the same project. Make backups"
+	exit
+else
+	command='sed -n '
+	extra='p'
+fi
+
+replacements=(
+	"s/02352A/disp_02352A/g"
+	"s/02531A/disp_02531A/g"
+	"s/10mm_disc/disc_10m/g"
+	"s/28BYJ_48/step_28BYJ_48/g"
+	"s/2p54boxhdr/boxhdr2p54/g"
+	"s/2p54header/header2p54/g"
+	"s/2p54joiner/joiner2p54/g"
+	"s/2p54socket/socket2p54/g"
+	"s/35BYGHJ75/step_35BYGHJ75/g"
+	"s/5_160430_7/faston_5_160430_7/g"
+	"s/6p4mm_disc/disc_6p4mm/g"
+	"s/7_segment_\([^\.]\)/disp_7_segment\1/g"
+	"s/7_segments\([^\.]\)/disp_7_segments\1/g"
+	"s/80ST_faceplate/faceplate_80ST/g"
+)
+
+find . -name '*.scad' | while read file
+do
+	echo $file
+	echo "-------------------------------------"
+	for r in ${replacements[*]}
+	do
+		$command "${r}${extra}" $file
+	done
+done
+
diff --git a/tests/7_segments.scad b/tests/7_segments.scad
index a6cd2eee..f5bae4d9 100644
--- a/tests/7_segments.scad
+++ b/tests/7_segments.scad
@@ -21,11 +21,11 @@ use <../utils/layout.scad>
 
 include <../vitamins/7_segments.scad>
 
-function digits(s) = 7_segment_digits(s) < 2 ? 2 : 1;
+function digits(s) = disp_7_segment_digits(s) < 2 ? 2 : 1;
 
-module 7_segments()
-    layout([for(s = 7_segments) 7_segment_size(s).x * digits(s)], 3) let(s = 7_segments[$i])
-        7_segment_digits(s, digits(s));
+module disp_7_segments()
+    layout([for(s = disp_7_segments) disp_7_segment_size(s).x * digits(s)], 3) let(s = disp_7_segments[$i])
+        disp_7_segment_digits(s, digits(s));
 
 if($preview)
-    7_segments();
+    disp_7_segments();
diff --git a/tests/PCB.scad b/tests/PCB.scad
index 4de0e4db..cbdc9505 100644
--- a/tests/PCB.scad
+++ b/tests/PCB.scad
@@ -35,8 +35,8 @@ TMC2130HeatSinkColor = "DeepSkyBlue";
 TMC2130 = ["TMC2130", "TMC2130",
     20, 14, 1.6, 0, 3, 0, "white", false, [],
     [
-        [  10,  1,  0, "-2p54header", 8, 1 ,undef, "blue" ],
-        [  10, 13,  0, "-2p54header", 8, 1],
+        [  10,  1,  0, "-header2p54", 8, 1 ,undef, "blue" ],
+        [  10, 13,  0, "-header2p54", 8, 1],
         [  12,  7,  0, "-chip", 6, 4, 1, grey(20) ],
         // mock up a heat sink
         [  10,  7,  0, "block", 9, 9,  2, TMC2130HeatSinkColor ],
@@ -89,13 +89,13 @@ test_pcb = ["test_pcb", "Test PCB",
 
         [ 30, 30,  -90, "smd_qfp", QFP50P1200X1200X160_64N, "ATSAM4S4BA"],
 
-        [ 45,  35,   0, "2p54header", 4, 1],
-        [ 60,  35,   0, "2p54header", 5, 1, false, "blue" ],
-        [ 60,  40, 180, "2p54header", 5, 1, false, undef, true],
-        [ 80,  33,   0, "2p54boxhdr", 4, 2],
-        [ 80,  40,   0, "2p54boxhdr", 4, 2, false, true, true],
-        [ 45,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
-        [ 60,  30,   0, "2p54socket", 6, 1],
+        [ 45,  35,   0, "header2p54", 4, 1],
+        [ 60,  35,   0, "header2p54", 5, 1, false, "blue" ],
+        [ 60,  40, 180, "header2p54", 5, 1, false, undef, true],
+        [ 80,  33,   0, "boxhdr2p54", 4, 2],
+        [ 80,  40,   0, "boxhdr2p54", 4, 2, false, true, true],
+        [ 45,  30,   0, "socket2p54", 4, 1, false, 0, false, "red" ],
+        [ 60,  30,   0, "socket2p54", 6, 1],
 
         [ 59,  60, 180, "led", LED3mm, "red"],
         [ 66,  60, 180, "led", LED5mm, "orange"],
@@ -201,8 +201,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 90, 140, -90, "relay", HF33F, "012-HSL-3F"],
 
 
-        [ 52, 206,   0, "2p54socket", 8, 1 ],
-        [ 52, 194,   0, "2p54socket", 8, 1, false, 0, false, "red" ],
+        [ 52, 206,   0, "socket2p54", 8, 1 ],
+        [ 52, 194,   0, "socket2p54", 8, 1, false, 0, false, "red" ],
         [ 55, 220,   0, "standoff",  5, 4.5, 12.5, 2.54],
         [ 60, 240,   0, "potentiometer"],
         [ 75, 240,   0, "potentiometer", KY_040_encoder, 8],
diff --git a/tests/PCB_mount.scad b/tests/PCB_mount.scad
index e1fe8a38..376b3375 100644
--- a/tests/PCB_mount.scad
+++ b/tests/PCB_mount.scad
@@ -23,7 +23,7 @@ PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", tru
     [[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
      [(3.46  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
      [(3.91  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
-     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2],
+     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "socket2p54", 13, 2],
     ], []];
 
 module pcb_mounts()
diff --git a/vitamins/7_segment.scad b/vitamins/7_segment.scad
index 192fcb4b..5b184cb1 100644
--- a/vitamins/7_segment.scad
+++ b/vitamins/7_segment.scad
@@ -27,22 +27,22 @@ include <../utils/core/core.scad>
 use <../utils/pcb_utils.scad>
 
 
-function 7_segment_size(type)       = type[1]; //! Size of the body
-function 7_segment_digit_size(type) = type[2]; //! Size of the actual digit and segment width and angle
-function 7_segment_pins(type)       = type[3]; //! [x, y] array of pins
-function 7_segment_pin_pitch(type)  = type[4]; //! x and y pin pitches and pin diameter
+function disp_7_segment_size(type)       = type[1]; //! Size of the body
+function disp_7_segment_digit_size(type) = type[2]; //! Size of the actual digit and segment width and angle
+function disp_7_segment_pins(type)       = type[3]; //! [x, y] array of pins
+function disp_7_segment_pin_pitch(type)  = type[4]; //! x and y pin pitches and pin diameter
 
-function 7_segment_digits(type) = let(d = 7_segment_digit_size(type)) floor(7_segment_size(type).x / (d.x + d.y * tan(d[3])));
+function disp_7_segment_digits(type) = let(d = disp_7_segment_digit_size(type)) floor(disp_7_segment_size(type).x / (d.x + d.y * tan(d[3])));
 
-module 7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the specified 7 segment digit
-    size = 7_segment_size(type);
-    digit = 7_segment_digit_size(type);
-    pins = 7_segment_pins(type);
-    pin_pitch = 7_segment_pin_pitch(type);
+module disp_7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the specified 7 segment digit
+    size = disp_7_segment_size(type);
+    digit = disp_7_segment_digit_size(type);
+    pins = disp_7_segment_pins(type);
+    pin_pitch = disp_7_segment_pin_pitch(type);
 
     t = digit[2];
     a = digit[3];
-    digits = 7_segment_digits(type);
+    digits = disp_7_segment_digits(type);
     pitch = size.x / digits;
     has_dp = (pins.x * pins.y) > 7 + digits;
 
@@ -108,8 +108,8 @@ module 7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the
              }
 }
 
-module 7_segment_digits(type, n, colour = grey(70), pin_length = 6.4, cutout = false) { //! Draw n digits side by side
-    size = 7_segment_size(type);
+module disp_7_segment_digits(type, n, colour = grey(70), pin_length = 6.4, cutout = false) { //! Draw n digits side by side
+    size = disp_7_segment_size(type);
 
     if(cutout)
         linear_extrude(100)
@@ -117,5 +117,5 @@ module 7_segment_digits(type, n, colour = grey(70), pin_length = 6.4, cutout = f
     else
         for(i = [0 : 1 : n - 1])
             translate([(i - (n - 1) / 2) * size.x, 0])
-                7_segment_digit(type, colour, pin_length);
+                disp_7_segment_digit(type, colour, pin_length);
 }
diff --git a/vitamins/7_segments.scad b/vitamins/7_segments.scad
index de4adf67..a21a3988 100644
--- a/vitamins/7_segments.scad
+++ b/vitamins/7_segments.scad
@@ -21,10 +21,10 @@
 //! 7 Segment displays
 //
 
-02531A    = ["02531A",    [15.0,  8, 4.0], [3.5, 6.2,  0.7,  5], [5, 2], [inch(0.1), inch(0.1), 0.45]];
-02352A    = ["02352A",    [15.0,  8, 4.0], [3.5, 6.2,  0.6,  5], [6, 2], [inch(0.1), 5.52,      0.45]];
+disp_02531A    = ["disp_02531A",    [15.0,  8, 4.0], [3.5, 6.2,  0.7,  5], [5, 2], [inch(0.1), inch(0.1), 0.45]];
+disp_02352A    = ["disp_02352A",    [15.0,  8, 4.0], [3.5, 6.2,  0.6,  5], [6, 2], [inch(0.1), 5.52,      0.45]];
 WT5011BSR = ["WT5011BSR", [12.7, 19, 8.2], [7.2, 12.7, 1.2, 10], [5, 2], [inch(0.1), inch(0.6), 0.4]];
 
-7_segments = [02531A, 02352A, WT5011BSR];
+disp_7_segments = [disp_02531A, disp_02352A, WT5011BSR];
 
 use <7_segment.scad>
diff --git a/vitamins/cameras.scad b/vitamins/cameras.scad
index 3e4a0e82..f911323b 100644
--- a/vitamins/cameras.scad
+++ b/vitamins/cameras.scad
@@ -97,7 +97,7 @@ ESP32_module =  ["", "", 18, 26, 0.8,   0, 0.7, [1.1, 1.1, 0, gold], grey(18), f
 ESP32_CAM_pcb = ["", "", 27, 40, 1.7, 2.5, 0, 0, grey(15), false, [],
     [
         [27 / 2, 26 / 2, 0, "-pcb", 0, ESP32_module],
-        for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-2p54joiner", 1, 8],
+        for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-joiner2p54", 1, 8],
         [ 27 / 2, -8, 90, "uSD", [14.85, 14.65, 1.8]],
         [ 27 / 2 + 1, 15, 0, "flat_flex", false],
         [ 27 / 2 + inch(0.45), 10.5, 0, "block", 3, 3, 0.8, grey(90)],
diff --git a/vitamins/displays.scad b/vitamins/displays.scad
index a1bc2ecc..5223856d 100644
--- a/vitamins/displays.scad
+++ b/vitamins/displays.scad
@@ -25,8 +25,8 @@ HDMI5PCB = pcb("", "",  [121.11, 77.93, 1.65], hole_d = 2.2, colour = "mediumblu
      [ 47.245,-2.5, 90, "usb_uA"],
      [-53.14, -4.4, 90, "hdmi"],
      [ 53.7,  40.6,  0, "chip",       14, 14, 1],
-     [ 59.8,  25.2,  0, "2p54socket", 13, 2, false, 13.71],
-     [ 59.8,  10.12, 0, "2p54header", 13, 2, true],
+     [ 59.8,  25.2,  0, "socket2p54", 13, 2, false, 13.71],
+     [ 59.8,  10.12, 0, "header2p54", 13, 2, true],
     ]
 );
 
@@ -41,7 +41,7 @@ HDMI5 = ["HDMI5", "HDMI display 5\"", 121, 76, 2.85, HDMI5PCB,
 LCD1602APCB = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
     holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
     components = [
-        [-27.05, - 2.5, 0, "2p54header", 16, 1]
+        [-27.05, - 2.5, 0, "header2p54", 16, 1]
     ],
     grid = [
           52.95 - inch(0.75), 36 - 2.5, 16, 1, silver, inch(0.1), inch(0.1),
@@ -51,7 +51,7 @@ LCD1602APCB = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "gr
 LCD1602APCBI2C = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
     holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
     components = [
-        [-27.05, - 2.5, 0, "2p54header", 16, 1],
+        [-27.05, - 2.5, 0, "header2p54", 16, 1],
         [ -27.05, -10.0, 0, "pcb", 3, I2C_LCD_Backpack],
     ],
     grid = [
@@ -78,7 +78,7 @@ LCD1602AI2C = ["LCD1602A", "LCD display 1602A", 71.3, 24.3, 7.0, LCD1602APCBI2C,
 LCD2004APCB = pcb("", "", [98, 60, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
     holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
     components = [
-        [49+19.05, - 2.5, 0, "2p54header", 16, 1]
+        [49+19.05, - 2.5, 0, "header2p54", 16, 1]
     ],
     grid = [
           49, 60 - 2.5, 16, 1, silver, inch(0.1), inch(0.1),
@@ -96,7 +96,7 @@ LCD2004A = ["LCD2004A", "LCD display 2004A", 97, 39.5, 9.0, LCD2004APCB,
 LCDS7282BPCB = pcb("", "", [85, 36, 1.65], hole_d = 2.56, colour = "green",
     holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
     components = [
-        [3.5, 18, 0, "2p54header", 2, 7]
+        [3.5, 18, 0, "header2p54", 2, 7]
     ],
     grid = [3.5 - inch(0.05), 18 - inch(0.3), 2, 7, silver, inch(0.1), inch(0.1)]
 );
@@ -111,7 +111,7 @@ LCDS7282B = ["LCDS7282B", "LCD display S-7282B", 73.6, 28.7, 9.6, LCDS7282BPCB,
 
 SSD1963_4p3PCB = pcb("", "", [120, 74, 1.65], corner_r = 3, hole_d = 3, colour = "mediumblue",
     holes = [[3, 3], [-3, 3], [-3, -3], [3, -3]],
-    components = [ [2.75 + 1.27, 37, 90, "2p54header", 20, 2] ],
+    components = [ [2.75 + 1.27, 37, 90, "header2p54", 20, 2] ],
     grid = [2.75, 37 - inch(0.95),  2, 20, silver, inch(0.1), inch(0.1)]
 );
 
@@ -160,11 +160,11 @@ BigTreeTech_TFT35v3_0_PCB = ["", "",
         [  (6.84 + 12.85)/2, -(45.73 + 51.73)/2,    0, "-button_6mm" ],
         [               102,  (15.57 + 42.07)/2,    0, "uSD", [26.5, 16, 3] ],
         [                 8, -( 6.76 + 18.76)/2,  180, "usb_A" ],
-        [                23,  (23.32 + 33.64)/2,   90, "2p54socket", 4, 2 ], // ESP-8266
+        [                23,  (23.32 + 33.64)/2,   90, "socket2p54", 4, 2 ], // ESP-8266
 
-        [ 16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [ 36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [ 56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 16.5, 5.9,    0, "boxhdr2p54", 5, 2 ],
+        [ 36.5, 5.9,    0, "boxhdr2p54", 5, 2 ],
+        [ 56.5, 5.9,    0, "boxhdr2p54", 5, 2 ],
         [ 82.5,   4,    0, "jst_xh", 5 ],
         [ 26.5, 52.8, 180, "jst_xh", 2 ],
         [ 39.5, 52.8, 180, "jst_xh", 3 ],
diff --git a/vitamins/fastons.scad b/vitamins/fastons.scad
index 8dcf415d..41cd93d1 100644
--- a/vitamins/fastons.scad
+++ b/vitamins/fastons.scad
@@ -21,8 +21,8 @@
 //! Faston receptacles to mate with spade connectors
 //
 
-5_160430_7 = ["5_160430_7", 4.75, [5.6, 2.56, 6.3], 2.25, 1.13, 0.32, 3.2, 1.64, [1.64, 3.09, 9], 0.5, 0.96, 1.7, 3.53, [2.08, 4.47, 13.3], -0.4];
+faston_5_160430_7 = ["faston_5_160430_7", 4.75, [5.6, 2.56, 6.3], 2.25, 1.13, 0.32, 3.2, 1.64, [1.64, 3.09, 9], 0.5, 0.96, 1.7, 3.53, [2.08, 4.47, 13.3], -0.4];
 
-fastons = [5_160430_7];
+fastons = [faston_5_160430_7];
 
 use <faston.scad>
diff --git a/vitamins/geared_steppers.scad b/vitamins/geared_steppers.scad
index ae5bd9e2..07e96b49 100644
--- a/vitamins/geared_steppers.scad
+++ b/vitamins/geared_steppers.scad
@@ -27,9 +27,9 @@
 //                                              h   u    r           h  w    t        e           t        t          e                       e
 //                                              t   s                              d  t   d    h       w       l                              2               d
 //                                                       d   h  r                                 d        l          w   d       h   z       w     d     h
-28BYJ_48  = ["28BYJ_48",  "28BYJ-48 5V",   28, 19,  1, [ 0,  0, 0], 35, 7, 0.85, 4.2, 8,  9, 1.5, 5,-3.0, 10,  6, [14.7, 17,   16.5,  0], [17.7, 15.5, 13.8], 1,  [["yellow", "orange", "red", "pink", "blue"]] ];
-35BYGHJ75 = ["35BYGHJ75", "35BYGHJ75 0.4A",37, 37, -2, [35, 22, 1], 27, 0,    0, 3.0, 7, 12, 3.0, 5, 4.5, 17, 10, [ 7.7, 20.7, 9.25, 21], [   0,    0,    0], 1.3,[["brown", "red"], ["yellow", "green"]] ];
+step_28BYJ_48  = ["step_28BYJ_48",  "28BYJ-48 5V",   28, 19,  1, [ 0,  0, 0], 35, 7, 0.85, 4.2, 8,  9, 1.5, 5,-3.0, 10,  6, [14.7, 17,   16.5,  0], [17.7, 15.5, 13.8], 1,  [["yellow", "orange", "red", "pink", "blue"]] ];
+step_35BYGHJ75 = ["step_35BYGHJ75", "35BYGHJ75 0.4A",37, 37, -2, [35, 22, 1], 27, 0,    0, 3.0, 7, 12, 3.0, 5, 4.5, 17, 10, [ 7.7, 20.7, 9.25, 21], [   0,    0,    0], 1.3,[["brown", "red"], ["yellow", "green"]] ];
 
-geared_steppers = [28BYJ_48, 35BYGHJ75];
+geared_steppers = [step_28BYJ_48, step_35BYGHJ75];
 
 use <geared_stepper.scad>
diff --git a/vitamins/microview.scad b/vitamins/microview.scad
index 124fea6f..eeed9947 100644
--- a/vitamins/microview.scad
+++ b/vitamins/microview.scad
@@ -54,6 +54,6 @@ module microview(cutout = false) {  //! Draw microview or generate a panel cutou
 
             for(side = [-1, 1], i = [0 : 7])
                 translate([side * inch(0.35), (i - 3.5) * inch(0.1)])
-                    pin(2p54header);
+                    pin(header2p54);
         }
 }
diff --git a/vitamins/opengrab.scad b/vitamins/opengrab.scad
index 65a67c93..bfaf45a3 100644
--- a/vitamins/opengrab.scad
+++ b/vitamins/opengrab.scad
@@ -41,7 +41,7 @@ pcb = ["", "", width, width, 0.8, 0, 3.5, 0, "darkgreen", false, [],
     [     [ 3.475,  19.05,    0, "button_4p5mm"],
           [ 2.2,    24.125,   0, "smd_led", LED0805, "green"],
           [ 2.375,  27.9,     0, "smd_led", LED0805, "red"],
-          [ 28.4,   13.345,   0, "2p54header", 3, 1, false, undef, true],
+          [ 28.4,   13.345,   0, "header2p54", 3, 1, false, undef, true],
      ]];
 
 module opengrab_hole_positions()    //! Position children at the screw positions
diff --git a/vitamins/pcb.scad b/vitamins/pcb.scad
index cf7ea678..472ef53f 100644
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -1166,12 +1166,12 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
     function param(n, default = 0) = len(comp) > n && !is_undef(comp[n]) ? comp[n] : default;
     rotate(comp.z) {
         // Components that have a cutout parameter go in this section
-        if(show(comp, "2p54header")) let($show_plugs = show_plugs && param(9, true))
-                                        pin_header(2p54header, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
-        if(show(comp, "2p54joiner"))    pin_header(2p54joiner, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
-        if(show(comp, "2p54boxhdr")) let($show_plugs = show_plugs && param(7, true))
-                                        box_header(2p54header, comp[4], comp[5], param(6, false), cutouts, param(8, false));
-        if(show(comp, "2p54socket"))    pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
+        if(show(comp, "header2p54")) let($show_plugs = show_plugs && param(9, true))
+                                        pin_header(header2p54, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
+        if(show(comp, "joiner2p54"))    pin_header(joiner2p54, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
+        if(show(comp, "boxhdr2p54")) let($show_plugs = show_plugs && param(7, true))
+                                        box_header(header2p54, comp[4], comp[5], param(6, false), cutouts, param(8, false));
+        if(show(comp, "socket2p54"))    pin_socket(header2p54, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
         if(show(comp, "chip"))          chip(comp[4], comp[5], comp[6], param(7, grey(30)), cutouts);
         if(show(comp, "rj45"))          rj45(cutouts);
         if(show(comp, "usb_A"))         usb_Ax1(cutouts);
@@ -1194,7 +1194,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "molex_usb_Ax2")) molex_usb_Ax2(cutouts);
         if(show(comp, "molex_usb_Ax1")) molex_usb_Ax1(cutouts);
         if(show(comp, "smd_led"))       smd_led(comp[4], comp[5], cutouts);
-        if(show(comp, "7seg"))          let(z = param(6, 0)) translate_z(z) 7_segment_digits(comp[4], comp[5], pin_length = z + 3, cutout = cutouts);
+        if(show(comp, "7seg"))          let(z = param(6, 0)) translate_z(z) disp_7_segment_digits(comp[4], comp[5], pin_length = z + 3, cutout = cutouts);
         if(show(comp, "block"))         block(size = [comp[4], comp[5], comp[6]], colour = comp[7], makes_cutout = param(8), r = param(9, 0), rtop = param(10, 0));
         if(!cutouts) {
             // Components that don't have a cutout parameter go in this section
@@ -1210,7 +1210,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "gterm508"))      green_terminal(gt_5p08, comp[4], comp[5], param(6,"lime"));
             if(show(comp, "gterm635"))      green_terminal(gt_6p35, comp[4], comp[5], param(6,"lime"));
             if(show(comp, "term35"))        terminal_35(comp[4], param(5,"blue"));
-            if(show(comp, "transition"))    idc_transition(2p54header, comp[4], comp[5]);
+            if(show(comp, "transition"))    idc_transition(header2p54, comp[4], comp[5]);
             if(show(comp, "led"))           let(z = param(6, 0)) translate_z(z + eps) led(comp[4], comp[5], 2.6 + z, param(7, 0));
             if(show(comp, "pdip"))          pdip(comp[4], comp[5], param(6, false), param(7, inch(0.3)));
             if(show(comp, "ax_res"))        ax_res(comp[4], comp[5], param(6, 5), param(7, 0));
diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad
index f85f4f8e..8c298ab2 100644
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -41,8 +41,8 @@ include <buttons.scad>
 Ethernet = ["Ethernet", "Duet Ethernet piggy back",
                                      33.8,  37.5,  1.6, 0,    2.54, 0, "#1D39AB",  false, [[27.1, -6.3], [7.5, -2.7], [21.3, -31.1]],
                                                                     [[10.7,  -13.1, 180, "rj45"],
-                                                                     [7.75, -36.2,   0, "-2p54header", 6, 1],
-                                                                     [7.75, -26.04,  0, "-2p54header", 6, 1],
+                                                                     [7.75, -36.2,   0, "-header2p54", 6, 1],
+                                                                     [7.75, -26.04,  0, "-header2p54", 6, 1],
                                                                      [27.1, -6.3,    0, "-standoff", 5, 4.5, 12.5, 2.54],
                                                                      [7.5, -2.70,    0, "-standoff", 5, 4.5, 12.5, 2.54],
                                                                      [21.3, -31.1,   0, "-standoff", 5, 4.5, 12.5, 2.54],
@@ -81,10 +81,10 @@ DuetE = ["DuetE", "Duet 2 Ethernet electronics",
                                                                      [ 84.1, -48.8, -90, "molex_hdr", 2],
                                                                      [ 77.9, -48.8, -90, "molex_hdr", 2],
 
-                                                                     [105.2, -54.9,  0, "2p54header", 2, 1],
-                                                                     [ 98.4, -54.9,  0, "2p54header", 2, 1],
-                                                                     [ 90.2, -54.9,  0, "2p54header", 3, 1],
-                                                                     [ 61.7, -83.1,  0, "2p54header", 5, 2],
+                                                                     [105.2, -54.9,  0, "header2p54", 2, 1],
+                                                                     [ 98.4, -54.9,  0, "header2p54", 2, 1],
+                                                                     [ 90.2, -54.9,  0, "header2p54", 3, 1],
+                                                                     [ 61.7, -83.1,  0, "header2p54", 5, 2],
 
                                                                      [ 29.5, -3.6,   90, "gterm35", 4],
 
@@ -95,9 +95,9 @@ DuetE = ["DuetE", "Duet 2 Ethernet electronics",
                                                                      [ 90.4, -18.8,   0, "chip", 10, 10, 2],
                                                                      [109.9, -22.0,   0, "chip", 10, 10, 2],
 
-                                                                     [105.8, -86.3,   0, "2p54boxhdr", 5, 2],
-                                                                     [ 85.2, -86.3,   0, "2p54boxhdr", 5, 2],
-                                                                     [ 79.9, -95.7, 180, "2p54boxhdr", 25, 2],
+                                                                     [105.8, -86.3,   0, "boxhdr2p54", 5, 2],
+                                                                     [ 85.2, -86.3,   0, "boxhdr2p54", 5, 2],
+                                                                     [ 79.9, -95.7, 180, "boxhdr2p54", 25, 2],
 
                                                                      [  2.0, -47.3, 180, "usb_uA"],
                                                                      [  8.4, -63.3, 180, "uSD", [15, 14.5, 2]],
@@ -124,14 +124,14 @@ DuetE = ["DuetE", "Duet 2 Ethernet electronics",
 
 Duex2 = ["Duex2", "Duex2 expansion board",
                                      123,   100,   1.6, 0,    4.2,  0, "#2140BE",  false, [[-4, 4], [-4, -4], [4, -4],[4, 4]],
-                                                                   [ [ 79.8,  -4.3, 180, "2p54boxhdr", 25, 2],
-                                                                     [ 27.8,  -3.0,   0, "2p54header", 10, 1],
+                                                                   [ [ 79.8,  -4.3, 180, "boxhdr2p54", 25, 2],
+                                                                     [ 27.8,  -3.0,   0, "header2p54", 10, 1],
 
-                                                                     [ 45.7, -14.7,   0, "2p54header",  3, 1], // Endstop voltage select
-                                                                     [ 34.8, -15.1,   0, "2p54header",  3, 2], // Fan voltage select
-                                                                     [  4.8, -55.2,  90, "2p54header",  1, 2], // 12V EN
-                                                                     [ 59.5, -30.3,   0, "2p54header",  3, 1], // 5V Aux select
-                                                                     [ 31.6, -41.4,   0, "2p54header",  2, 5], // SPIO
+                                                                     [ 45.7, -14.7,   0, "header2p54",  3, 1], // Endstop voltage select
+                                                                     [ 34.8, -15.1,   0, "header2p54",  3, 2], // Fan voltage select
+                                                                     [  4.8, -55.2,  90, "header2p54",  1, 2], // 12V EN
+                                                                     [ 59.5, -30.3,   0, "header2p54",  3, 1], // 5V Aux select
+                                                                     [ 31.6, -41.4,   0, "header2p54",  2, 5], // SPIO
 
                                                                      [  4.7, -11.8,  -90, "molex_hdr", 2], // Fan / LED 8
                                                                      [  4.9, -23.9,  -90, "molex_hdr", 2], // Fan / LED 7
@@ -219,9 +219,9 @@ BTT_RELAY_V1_2 = [
         [   2.5,  10.65, 270, "jst_xh", 2, false, grey(20), ],
         [   2.5,  18.15, 270, "jst_xh", 2, false, grey(20), ],
         [   2.5,  25.65, 270, "jst_xh", 2, false, grey(20), ],
-        [  11.0,   2.0,    0, "2p54header", 2, 1 ],
-        [  23.0,   2.0,    0, "2p54header", 4, 1 ],
-        [   7.9,  -3.3,   90, "2p54header", 2, 1 ],
+        [  11.0,   2.0,    0, "header2p54", 2, 1 ],
+        [  23.0,   2.0,    0, "header2p54", 4, 1 ],
+        [   7.9,  -3.3,   90, "header2p54", 2, 1 ],
         [  -6.5,   2.45, 180, "terminal",   3, [10, 1.33, 13.2, 16, 7, 13] ],
     ],
     [], // accessories
@@ -275,9 +275,9 @@ BTT_SKR_MINI_E3_V2_0 = [
         [  -3, -(22.27 + 29.92)/2, 0, "usb_uA" ],
         [  -8, -( 2.13 + 17.17)/2, 0, "uSD", [17.17 - 2.13, 16, 2] ],
         // EXP
-        [  -4.5, 17,   -90, "2p54boxhdr", 5, 2 ],
+        [  -4.5, 17,   -90, "boxhdr2p54", 5, 2 ],
         // TFT
-        [  66.1,  21.7,  0, "2p54header", 5, 1 ],
+        [  66.1,  21.7,  0, "header2p54", 5, 1 ],
         // FAN0
         [  50.25,  3.8,  0, "jst_xh", 2, false, grey(20) ],
         // FAN1
@@ -306,20 +306,20 @@ BTT_SKR_MINI_E3_V2_0 = [
         [  57.25, -4.2,  0, "jst_xh", 4, false, grey(20) ],
         [  70.75, -4.2,  0, "jst_xh", 4, false, grey(20) ],
         // motor jumpers
-        [  20.6,  44.1,  0, "2p54header", 2, 1 ],
-        [  39.6,  44.2,  0, "2p54header", 2, 1 ],
-        [  60.1,  44.1,  0, "2p54header", 2, 1 ],
-        [  80.3,  44.1,  0, "2p54header", 2, 1 ],
+        [  20.6,  44.1,  0, "header2p54", 2, 1 ],
+        [  39.6,  44.2,  0, "header2p54", 2, 1 ],
+        [  60.1,  44.1,  0, "header2p54", 2, 1 ],
+        [  80.3,  44.1,  0, "header2p54", 2, 1 ],
         // SWD
-        [  43.9,  39.2,  0, "2p54header", 1, 5 ],
+        [  43.9,  39.2,  0, "header2p54", 1, 5 ],
         // SPI
-        [  -3.1,  31.9,  0, "2p54header", 2, 3 ],
+        [  -3.1,  31.9,  0, "header2p54", 2, 3 ],
         // PWR-1
-        [  -12.8, 30.3,  0, "2p54header", 3, 1 ],
+        [  -12.8, 30.3,  0, "header2p54", 3, 1 ],
         // VOUT
-        [  -14.0, 34.4,  0, "2p54header", 2, 2 ],
+        [  -14.0, 34.4,  0, "header2p54", 2, 2 ],
         // VIN
-        [  17.3,  19.6,  0, "2p54header", 2, 2 ],
+        [  17.3,  19.6,  0, "header2p54", 2, 2 ],
     ],
     [] // accessories
 ];
@@ -372,11 +372,11 @@ BTT_SKR_E3_TURBO = [
         [  -8, -(12.13 + 27.17)/2, 0, "uSD", [17.17 - 2.13, 16, 2] ],
         [ -22.2,   51.6,   0, "button_6mm" ],
         // EXP
-        [  -4.45,  27.2, -90, "2p54boxhdr", 5, 2 ],
+        [  -4.45,  27.2, -90, "boxhdr2p54", 5, 2 ],
         // AUX-2
-        [  -3.4,   42.5, -90, "2p54header", 4, 2 ],
+        [  -3.4,   42.5, -90, "header2p54", 4, 2 ],
         // TFT
-        [  73.7,   21,     0, "2p54header", 5, 1 ],
+        [  73.7,   21,     0, "header2p54", 5, 1 ],
         // FAN0
         [  52.1,   15.3, 180, "jst_xh", 2, false, grey(20) ],
         // FAN1
@@ -394,7 +394,7 @@ BTT_SKR_E3_TURBO = [
         // PWR-DET
         [  87.7,   26.8, 180, "jst_xh", 3, false, grey(20) ],
         // FAN2
-        [  52.1,    3.8,   0, "2p54header", 1, 2],
+        [  52.1,    3.8,   0, "header2p54", 1, 2],
         // end stops and thermistors
         for (x = [58.5 : 7.9 : 98.1])
             [x,  3.7,  180, "jst_xh", 2, false, grey(20)],
@@ -404,15 +404,15 @@ BTT_SKR_E3_TURBO = [
         [47.3, -10.4,  0, "jst_xh", 4, false, grey(20)], // second Z connector
         // motor jumpers
         for (x = [9.4, 26.4, 42.5, 58.7, 75.3])
-            [x, -33.7,  0, "2p54header", 2, 1],
+            [x, -33.7,  0, "header2p54", 2, 1],
         // SWD
-        [  45.4,   35.7,   0, "2p54header", 5, 1 ],
+        [  45.4,   35.7,   0, "header2p54", 5, 1 ],
         // USB power jumber
-        [ -12.6,   40.3,   0, "2p54header", 3, 1 ],
+        [ -12.6,   40.3,   0, "header2p54", 3, 1 ],
         // VOUT
-        [ -13.9,   44.5,   0, "2p54header", 2, 2 ],
+        [ -13.9,   44.5,   0, "header2p54", 2, 2 ],
         // VIN
-        [  18.6,   29.8,   0, "2p54header", 2, 2 ],
+        [  18.6,   29.8,   0, "header2p54", 2, 2 ],
     ],
     [] // accessories
 ];
@@ -425,8 +425,8 @@ TMC2130 = [
     false, // true if parts should be separate BOM items
     [], // hole positions
     [
-        [  10,  1,  0, "-2p54header", 8, 1 ],
-        [  10, 13,  0, "-2p54header", 8, 1 ],
+        [  10,  1,  0, "-header2p54", 8, 1 ],
+        [  10, 13,  0, "-header2p54", 8, 1 ],
         [  12,  7,  0, "-chip", 6, 4, 1, grey(20) ],
         // mock up a heat sink
         [  10,  7,  0, "block", 9, 8.5, 2, "DeepSkyBlue" ],
@@ -452,7 +452,7 @@ BTT_SKR_V1_4_TURBO = [
         [ 105,   13,     0, "button_6mm" ],
         [  58,   43,     0, "chip", 15, 15, 1, grey(20) ],
         // ESP-01 socket
-        [  69.8,  4,     0, "2p54socket", 4, 2 ],
+        [  69.8,  4,     0, "socket2p54", 4, 2 ],
         // terminals
         [   5.3, 13.2, 180, "gterm", gt_5x17, 2, undef, grey(20)],
         [   5.3, 25.8, 180, "gterm", gt_5x17, 2, undef, grey(20)],
@@ -477,18 +477,18 @@ BTT_SKR_V1_4_TURBO = [
         [  77.2, 19.6, -90, "jst_xh", 3, false, grey(20) ],
         [  69.8, 11.0,   0, "jst_xh", 5, false, grey(20) ],
 
-        [  69.0, 19.2,   0,  "2p54header", 4, 1 ],
-        [  57.8, 18.0,   0,  "2p54header", 3, 2 ],
-        [  28.0, 19.7,   0,  "2p54header", 2, 2 ],
+        [  69.0, 19.2,   0,  "header2p54", 4, 1 ],
+        [  57.8, 18.0,   0,  "header2p54", 3, 2 ],
+        [  28.0, 19.7,   0,  "header2p54", 2, 2 ],
 
-        [  37.6, 28.8,   0,  "2p54header", 1, 3, undef, "red" ],
-        [  77.8, 27.5,   0,  "2p54header", 2, 2 ],
-        [  81.8, 26.4,   0,  "2p54header", 1, 3, undef, "red" ],
-        [  43.8, 42.8,   0,  "2p54header", 1, 5 ],
+        [  37.6, 28.8,   0,  "header2p54", 1, 3, undef, "red" ],
+        [  77.8, 27.5,   0,  "header2p54", 2, 2 ],
+        [  81.8, 26.4,   0,  "header2p54", 1, 3, undef, "red" ],
+        [  43.8, 42.8,   0,  "header2p54", 1, 5 ],
 
         // EXP1 & EXP2
-        [  -6.6, 29.4,  90, "2p54boxhdr", 5, 2 ],
-        [  -6.6, 50.4,  90, "2p54boxhdr", 5, 2 ],
+        [  -6.6, 29.4,  90, "boxhdr2p54", 5, 2 ],
+        [  -6.6, 50.4,  90, "boxhdr2p54", 5, 2 ],
 
         // motor axes connections
         [  11.2, -3.75, 180, "jst_xh", 2, false, grey(20) ],
@@ -501,36 +501,36 @@ BTT_SKR_V1_4_TURBO = [
         [  98.5, -3.75, 180, "jst_xh", 2, false, grey(20) ],
 
         // stepper drivers
-        [  11.5, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [  11.5, 75.2,  0, "2p54socket", 8, 1 ],
-        [   2.6, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  11.5, 62.5,  0, "socket2p54", 8, 1, undef, undef, undef, "red" ],
+        [  11.5, 75.2,  0, "socket2p54", 8, 1 ],
+        [   2.6, 66.3, 90, "socket2p54", 2, 1, undef, undef, undef, "red" ],
         [  11.5, 68.85, 0, "pcb", 11, TMC2130 ],
 
-        [  33.1, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [  33.1, 75.2,  0, "2p54socket", 8, 1 ],
-        [  24.2, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  33.1, 62.5,  0, "socket2p54", 8, 1, undef, undef, undef, "red" ],
+        [  33.1, 75.2,  0, "socket2p54", 8, 1 ],
+        [  24.2, 66.3, 90, "socket2p54", 2, 1, undef, undef, undef, "red" ],
         [  33.1, 68.85, 0, "pcb", 11, TMC2130 ],
 
-        [  54.8, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [  54.8, 75.2,  0, "2p54socket", 8, 1 ],
-        [  45.9, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  54.8, 62.5,  0, "socket2p54", 8, 1, undef, undef, undef, "red" ],
+        [  54.8, 75.2,  0, "socket2p54", 8, 1 ],
+        [  45.9, 66.3, 90, "socket2p54", 2, 1, undef, undef, undef, "red" ],
         [  54.8, 68.85, 0, "pcb", 11, TMC2130 ],
 
-        [  76.4, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [  76.4, 75.2,  0, "2p54socket", 8, 1 ],
-        [  67.5, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  76.4, 62.5,  0, "socket2p54", 8, 1, undef, undef, undef, "red" ],
+        [  76.4, 75.2,  0, "socket2p54", 8, 1 ],
+        [  67.5, 66.3, 90, "socket2p54", 2, 1, undef, undef, undef, "red" ],
         [  76.4, 68.85, 0, "pcb", 11, TMC2130 ],
 
-        [  98.1, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [  98.1, 75.2,  0, "2p54socket", 8, 1 ],
-        [  89.2, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  98.1, 62.5,  0, "socket2p54", 8, 1, undef, undef, undef, "red" ],
+        [  98.1, 75.2,  0, "socket2p54", 8, 1 ],
+        [  89.2, 66.3, 90, "socket2p54", 2, 1, undef, undef, undef, "red" ],
 
         // closed loop pins
-        [  24.4, 57.5,  0, "2p54header", 6, 1 ],
-        [  40.6, 57.5,  0, "2p54header", 6, 1 ],
-        [  56.7, 57.5,  0, "2p54header", 6, 1 ],
-        [  72.9, 57.5,  0, "2p54header", 6, 1 ],
-        [  89.1, 57.5,  0, "2p54header", 6, 1 ],
+        [  24.4, 57.5,  0, "header2p54", 6, 1 ],
+        [  40.6, 57.5,  0, "header2p54", 6, 1 ],
+        [  56.7, 57.5,  0, "header2p54", 6, 1 ],
+        [  72.9, 57.5,  0, "header2p54", 6, 1 ],
+        [  89.1, 57.5,  0, "header2p54", 6, 1 ],
     ],
     [] // accessories
 ];
@@ -552,33 +552,33 @@ MELLOW_FLY_D5 = [
     [ // components
         // motor connections, stepper sockets
         [  0*15.8+7+12.5/2, 7/2,      180, "jst_xh",     4, false, grey(20) ],
-        [  0*15.8+18+2.5/2, 5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef, "RoyalBlue" ],
-        [  0*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "2p54socket", 2, 1],
-        [  0*15.8+5.5+2.5/2,  5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef],
+        [  0*15.8+18+2.5/2, 5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef, "RoyalBlue" ],
+        [  0*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "socket2p54", 2, 1],
+        [  0*15.8+5.5+2.5/2,  5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef],
         [  0*15.8+5.1+2.5/2+6.5,  5.8+21/2,  90, "pcb", 11, TMC2130],
 
         [  1*15.8+7+12.5/2, 7/2,      180, "jst_xh",     4, false, grey(20) ],
-        [  1*15.8+18+2.5/2, 5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef, "RoyalBlue" ],
-        [  1*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "2p54socket", 2, 1],
-        [  1*15.8+5.5+2.5/2,  5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef],
+        [  1*15.8+18+2.5/2, 5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef, "RoyalBlue" ],
+        [  1*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "socket2p54", 2, 1],
+        [  1*15.8+5.5+2.5/2,  5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef],
         [  1*15.8+5.1+2.5/2+6.5,  5.8+21/2,  90, "pcb", 11, TMC2130],
 
         [  2*15.8+7+12.5/2, 7/2,      180, "jst_xh",     4, false, grey(20) ],
-        [  2*15.8+18+2.5/2, 5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef, "RoyalBlue" ],
-        [  2*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "2p54socket", 2, 1],
-        [  2*15.8+5.5+2.5/2,  5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef],
+        [  2*15.8+18+2.5/2, 5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef, "RoyalBlue" ],
+        [  2*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "socket2p54", 2, 1],
+        [  2*15.8+5.5+2.5/2,  5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef],
         [  2*15.8+5.1+2.5/2+6.5,  5.8+21/2,  90, "pcb", 11, TMC2130],
 
         [  3*15.8+7+12.5/2, 7/2,      180, "jst_xh",     4, false, grey(20) ],
-        [  3*15.8+18+2.5/2, 5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef, "RoyalBlue" ],
-        [  3*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "2p54socket", 2, 1],
-        [  3*15.8+5.5+2.5/2,  5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef],
+        [  3*15.8+18+2.5/2, 5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef, "RoyalBlue" ],
+        [  3*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "socket2p54", 2, 1],
+        [  3*15.8+5.5+2.5/2,  5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef],
         [  3*15.8+5.1+2.5/2+6.5,  5.8+21/2,  90, "pcb", 11, TMC2130],
 
         [  4*15.8+7+12.5/2, 7/2,      180, "jst_xh",     4, false, grey(20) ],
-        [  4*15.8+18+2.5/2, 5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef, "RoyalBlue" ],
-        [  4*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "2p54socket", 2, 1],
-        [  4*15.8+5.5+2.5/2,  5.8+21/2,  90, "2p54socket", 8, 1, undef, undef, undef],
+        [  4*15.8+18+2.5/2, 5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef, "RoyalBlue" ],
+        [  4*15.8+12.5+5.4/2, 5.8+2.6/2,  0, "socket2p54", 2, 1],
+        [  4*15.8+5.5+2.5/2,  5.8+21/2,  90, "socket2p54", 8, 1, undef, undef, undef],
 
         // thermistors
         [  0*8+7.8+7.4/2,  -(0*6+5.7/2),  180, "jst_xh", 2, false, grey(20) ],
@@ -610,8 +610,8 @@ MELLOW_FLY_D5 = [
         [  -26-10/2,    -20-10/2,      0, "chip", 10, 10,   1,   grey(15) ],
 
         // EXP1 & EXP2
-        [  -20/2, -17-9/2,  180, "2p54boxhdr", 5, 2 ],
-        [  -20/2, -26-9/2,  180, "2p54boxhdr", 5, 2 ],
+        [  -20/2, -17-9/2,  180, "boxhdr2p54", 5, 2 ],
+        [  -20/2, -26-9/2,  180, "boxhdr2p54", 5, 2 ],
 
         // USB connection
         [-3, -7-9/2, 0, "usb_C"],
@@ -629,9 +629,9 @@ Melzi = ["Melzi", "Melzi electronics", 203.2, 49.53, 1.6, 3.81, 3.1,  6, "green"
                                                                     [": USB A to Mini B lead", ": Micro SD card"]];
 
 OPZ2 =  ["OPZ2", "Orange Pi Zero 2",     60,    53,    1.4, 1.75,    3, 5, "blue", false, [[2.5, 2.5], [-2.5, 2.5], [-2.5, -2.5], [2.5, -2.5]],
-    [[-2.54, 53/2, 90, "2p54header", 13, 2],
-     [-10, -10-2.54*2, 0, "2p54header", 3, 1],
-     [2.54/2, 53/2, 90, "2p54header", 13, 1],
+    [[-2.54, 53/2, 90, "header2p54", 13, 2],
+     [-10, -10-2.54*2, 0, "header2p54", 3, 1],
+     [2.54/2, 53/2, 90, "header2p54", 13, 1],
      [6+16/2, -10.5+1, 90, "rj45"],
      [24+9/2, -3.6+1, 90, "usb_C"],
      [37+6.5/2,  -8.5/2+1, 90, "micro_hdmi"],
@@ -646,7 +646,7 @@ OPZ2 =  ["OPZ2", "Orange Pi Zero 2",     60,    53,    1.4, 1.75,    3, 5, "blue
     [60-2.54*1.5, 53/2 - 6*2.54, 2, 13]];
 
 RPI3A =  ["RPI3A", "Raspberry Pi 3 A+",     65,    56,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [61.5, 3.5], [61.5, -3.5], [3.5, -3.5]],
-    [[32.5, -3.5,   0, "2p54header", 20, 2],
+    [[32.5, -3.5,   0, "header2p54", 20, 2],
      [27,   -24.6,  0, "chip",       14, 14, 1],
      [53.5,   6,  -90, "jack"],
      [32,   4.4,  -90, "hdmi"],
@@ -660,7 +660,7 @@ RPI3A =  ["RPI3A", "Raspberry Pi 3 A+",     65,    56,    1.4, 3,    2.75, 6, "g
     [32.5 - 9.5 * 2.54, 52.5 - 1.27, 20, 2]];
 
 RPI3 =  ["RPI3", "Raspberry Pi 3",     85,    56,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [61.5, 3.5], [61.5, -3.5], [3.5, -3.5]],
-    [[32.5, -3.5,   0, "2p54header", 20, 2],
+    [[32.5, -3.5,   0, "header2p54", 20, 2],
      [27,   -24.6,  0, "chip",       14, 14, 1],
      [60,   -22.3,  0, "chip",       9, 9, 0.6],
      [-8.5,  10.25, 0, "rj45"],
@@ -677,7 +677,7 @@ RPI3 =  ["RPI3", "Raspberry Pi 3",     85,    56,    1.4, 3,    2.75, 6, "green"
     [32.5 - 9.5 * 2.54, 52.5 - 1.27, 20, 2]];
 
 RPI4 = ["RPI4", "Raspberry Pi 4", 85, 56, 1.4, 3, 2.75, 6, "green", false, [[3.5, 3.5], [61.5, 3.5], [61.5, -3.5], [3.5, -3.5]], [
-    [32.5, -3.5, 0, "2p54header", 20, 2],
+    [32.5, -3.5, 0, "header2p54", 20, 2],
     [-6.5, 9, 0, "usb_Ax2"],
     [-6.5, 27, 0, "usb_Ax2"],
     [-8.5, 45.75, 0, "rj45"],
@@ -696,7 +696,7 @@ RPI4 = ["RPI4", "Raspberry Pi 4", 85, 56, 1.4, 3, 2.75, 6, "green", false, [[3.5
 ];
 
 RPI0 =  ["RPI0", "Raspberry Pi Zero",     65,    30,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]],
-    [//[32.5, -3.5,   0, "2p54header", 20, 2],
+    [//[32.5, -3.5,   0, "header2p54", 20, 2],
      [25.5,  13,      0, "chip",       12, 12, 1.2],
      [12.4,  3.4,   -90, "mini_hdmi"],
      [54,    2,     -90, "usb_uA"],
@@ -730,7 +730,7 @@ RPI_Pico = [
 ];
 
 EnviroPlus =  ["EnviroPlus", "Enviro+",     65,    30.6,    1.6, 3,    2.75, 6, "white", false, [[3.5, 3.8], [-3.5, 3.8], [-3.5, -3.8], [3.5, -3.8]],
-    [[32.5, -3.8,   0, "-2p54socket", 20, 2, false, 5, true],
+    [[32.5, -3.8,   0, "-socket2p54", 20, 2, false, 5, true],
      [-15.5, 2.5,   0, "-chip", 15, 5, 3, "white"],
      [-14.25,16.25, 0, "chip", 27.5, 13.5, 1.5]
     ],
@@ -739,12 +739,12 @@ EnviroPlus =  ["EnviroPlus", "Enviro+",     65,    30.6,    1.6, 3,    2.75, 6,
 
 
 ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
-    [[30.226, -2.54, 0, "2p54socket", 10, 1],
-     [54.61,  -2.54, 0, "2p54socket", 8, 1],
-     [36.83,   2.54, 0, "2p54socket", 8, 1],
-     [57.15,   2.54, 0, "2p54socket", 6, 1],
-     [64.91,  27.89, 0, "2p54header", 2, 3],
-     [18.796, -7.00, 0, "2p54header", 3, 2],
+    [[30.226, -2.54, 0, "socket2p54", 10, 1],
+     [54.61,  -2.54, 0, "socket2p54", 8, 1],
+     [36.83,   2.54, 0, "socket2p54", 8, 1],
+     [57.15,   2.54, 0, "socket2p54", 6, 1],
+     [64.91,  27.89, 0, "header2p54", 2, 3],
+     [18.796, -7.00, 0, "header2p54", 3, 2],
      [ 6.5,   -3.5,  0, "button_6mm"],
      [4.7625,  7.62, 180,"barrel_jack"],
      [1.5875, 37.78, 180,"usb_B"],
@@ -774,11 +774,11 @@ ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#
    ];
 
 ArduinoLeonardo = ["ArduinoLeonardo", "Arduino Leonardo", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
-    [[30.226, -2.54, 0, "2p54socket", 10, 1],
-     [54.61,  -2.54, 0, "2p54socket", 8, 1],
-     [36.83,   2.54, 0, "2p54socket", 8, 1],
-     [57.15,   2.54, 0, "2p54socket", 6, 1],
-     [64.91,  27.89, 0, "2p54header", 2, 3],
+    [[30.226, -2.54, 0, "socket2p54", 10, 1],
+     [54.61,  -2.54, 0, "socket2p54", 8, 1],
+     [36.83,   2.54, 0, "socket2p54", 8, 1],
+     [57.15,   2.54, 0, "socket2p54", 6, 1],
+     [64.91,  27.89, 0, "header2p54", 2, 3],
      [ 6.5,   -3.5,  0, "button_6mm"],
      [4.7625,  7.62, 180, "barrel_jack"],
      [1.5875, 38.1,  180,"usb_uA"],
@@ -799,10 +799,10 @@ ArduinoLeonardo = ["ArduinoLeonardo", "Arduino Leonardo", 68.58, 53.34, 1.6, 0,
    ];
 
 Keyes5p1 = ["Keyes5p1", "Keyes5.1 Arduino Uno expansion board", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
-    [[30.226, -2.54, 0, "-2p54header", 10, 1],
-     [54.61,  -2.54, 0, "-2p54header", 8, 1],
-     [36.83,   2.54, 0, "-2p54header", 8, 1],
-     [57.15,   2.54, 0, "-2p54header", 6, 1],
+    [[30.226, -2.54, 0, "-header2p54", 10, 1],
+     [54.61,  -2.54, 0, "-header2p54", 8, 1],
+     [36.83,   2.54, 0, "-header2p54", 8, 1],
+     [57.15,   2.54, 0, "-header2p54", 6, 1],
     ],
     [],[],
     inch([
@@ -832,13 +832,13 @@ PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", tru
     [[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
      [(3.46  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
      [(3.91  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
-     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2, true],
+     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "socket2p54", 13, 2, true],
     ], []];
 
 ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "green", false, [[2.25, 3.25], [-2.25, 3.25], [2.25, -3.25], [-2.25, -3.25] ],
     [ [ 11.725, 8.3,  -90, "jst_xh", 5],
-      [ -6.5,  10,      0, "2p54header", 1, 4],
-      [ 20.4,  -4.5,    0, "2p54header", 4, 1],
+      [ -6.5,  10,      0, "header2p54", 1, 4],
+      [ 20.4,  -4.5,    0, "header2p54", 4, 1],
       [ 20.4,  11,  180, "pdip", 16, "ULN2003AN", true],
       [  5.5,  6,       0, "led", LED3mm, [1,1,1, 0.5]],
       [  5.5,  10.5,    0, "led", LED3mm, [1,1,1, 0.5]],
@@ -874,7 +874,7 @@ HW803_1WAY_RELAY = [
         [ 10.5 + 19/2, 26/2, 0,   "block", 19, 15, 15.5, "SkyBlue" ],
         [ 50-5,        26/2, 0,   "term35", 3],
         [ 5,           26/2, 180, "term35", 3],
-        [ 34,             2, 0,   "2p54header", 3, 1 ],
+        [ 34,             2, 0,   "header2p54", 3, 1 ],
     ],
     [], // accessories
     [], // grid
@@ -961,7 +961,7 @@ ESP_01 = [
     false, // true if parts should be separate BOM items
     [], // hole positions
     [ // components
-        [   2.8,   -7.25, 0, "-2p54header", 2, 4 ],
+        [   2.8,   -7.25, 0, "-header2p54", 2, 4 ],
         [ -14.55, -11.3,  0, "chip", 5.25, 5.25, 2.25, grey(15) ],
         [ -14,     -5.2,  0, "chip", 4.5,  4.75, 1.1,  grey(15) ],
         // antenna
@@ -1043,9 +1043,9 @@ LIPO_fuel_gauge = [
      for(x = 3,     y = [-1,1]) [x * 2.54 + 5.27, y * 0.5 * 2.54 + 5]],
     [ // components
         [17, 5, 90, "jst_ph", 2, true],
-        [2.54 + 5.27,  1.5 * 2.54 + 5, 0, "-2p54joiner", 3, 1],
-        [2.54 + 5.27, -1.5 * 2.54 + 5, 0, "-2p54joiner", 3, 1],
-        [3 * 2.54 + 5.27, 5,           0, "-2p54joiner", 1, 2],
+        [2.54 + 5.27,  1.5 * 2.54 + 5, 0, "-joiner2p54", 3, 1],
+        [2.54 + 5.27, -1.5 * 2.54 + 5, 0, "-joiner2p54", 3, 1],
+        [3 * 2.54 + 5.27, 5,           0, "-joiner2p54", 1, 2],
         [6.4 + 1.5, 5, 0, "chip", 3, 2, 0.8],
         [1.2,  2.5, 90, "smd_res", RES0603, "472"],
         [2.4,  2.5, 90, "smd_res", RES0603, "472"],
@@ -1071,8 +1071,8 @@ ESP32_DOIT_V1 = let(l = 51.45, w = 28.33, pitch = inch(1), pins = 15, poffset =
     false, // true if parts should be separate BOM items
     [for(x = [-1, 1], y = [-1, 1]) [x * 46.7 / 2 + l / 2, y * 23.4 / 2 + w / 2, false]],
     [ // components
-      [l / 2 + poffset, w / 2 - pitch / 2, 0, "-2p54joiner", pins, 1],
-      [l / 2 + poffset, w / 2 + pitch / 2, 0, "-2p54joiner", pins, 1],
+      [l / 2 + poffset, w / 2 - pitch / 2, 0, "-joiner2p54", pins, 1],
+      [l / 2 + poffset, w / 2 + pitch / 2, 0, "-joiner2p54", pins, 1],
       [1.75, w / 2, 180, "usb_uA" ],
       [35,  w / 2, 0, "block", 17.7, 16, 3, silver, false, 0.3, 0.3], // can
       for(y=[-1,1]) [3.5,  y * 6.5, 0, "chip", 4,  3, 1.6, silver],   // Mock button surround
@@ -1095,9 +1095,9 @@ ArduinoNano = let(l = 43.18, w = 17.78, pitch = inch(0.6), pins = 15, poffset =
     false, // true if parts should be separate BOM items
     [for(x = [-1, 1], y = [-1, 1]) [x * 40.64 / 2 + l / 2, y * 15.24 / 2 + w / 2]],
     [ // components
-      [l / 2 + poffset, w / 2 - pitch / 2,  0, "-2p54joiner", pins, 1],
-      [l / 2 + poffset, w / 2 + pitch / 2,  0, "-2p54joiner", pins, 1],
-      [l / 2 + poffset + inch(0.75), w / 2, 0, "2p54header",  2,    3, false, undef, false, false],
+      [l / 2 + poffset, w / 2 - pitch / 2,  0, "-joiner2p54", pins, 1],
+      [l / 2 + poffset, w / 2 + pitch / 2,  0, "-joiner2p54", pins, 1],
+      [l / 2 + poffset + inch(0.75), w / 2, 0, "header2p54",  2,    3, false, undef, false, false],
       [3.1, w / 2, 180, "usb_miniA" ],
       [l / 2 - inch(0.25), w / 2, 45, "chip", 7, 7, 1.3],
       [l / 2 + poffset + inch(0.15), w / 2,    0, "chip", 3.5, 6,   1.8, silver ], // mock button
@@ -1119,9 +1119,9 @@ BlackPill = let(l = 52.81, w = 20.78, pitch = inch(0.6), pins = 20, poffset = in
     false, // true if parts should be separate BOM items
     [],
     [ // components
-      [l / 2 + poffset, w / 2 - pitch / 2,  0, "-2p54joiner", pins, 1, undef, "yellow"],
-      [l / 2 + poffset, w / 2 + pitch / 2,  0, "-2p54joiner", pins, 1, undef, "yellow"],
-      [l - inch(0.27), w / 2, 90, "2p54header",  4,    1, undef, undef, true],
+      [l / 2 + poffset, w / 2 - pitch / 2,  0, "-joiner2p54", pins, 1, undef, "yellow"],
+      [l / 2 + poffset, w / 2 + pitch / 2,  0, "-joiner2p54", pins, 1, undef, "yellow"],
+      [l - inch(0.27), w / 2, 90, "header2p54",  4,    1, undef, undef, true],
       [ l -26.75, w / 2, 45, "chip", 7, 7, 1.3],
       [ 3.6, w / 2, 180, "usb_C" ],
       [ 15,                       5.3,   0, "text",    4, 1.27, "BOOT0"],
@@ -1149,14 +1149,14 @@ KY_040 = ["KY_040", "KY-040 rotart encoder breakout",
      [3.23 + 1.5 + 16.775, 1.3 + 1.5]
     ],
     [
-       [-3, 12, 90, "2p54header", 5, 1, undef, undef, true],
+       [-3, 12, 90, "header2p54", 5, 1, undef, undef, true],
        [10.8, 11.3, 0, "potentiometer", KY_040_encoder],
     ],
     []];
 
 L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3, 0, "#2140BE", false, [[10.7, 2.3], [10.7, -2.3], [-5.3, 2.3], [-5.3, -2.3] ],
     [
-        [ -1.3,  11.5,      0, "2p54header", 1, 6],
+        [ -1.3,  11.5,      0, "header2p54", 1, 6],
         [  16, 9.5      ,   0, "smd_led", LED0805, "red"],
         for(i = [-1, 1]) [ 4, 5.5*i, 180, "gterm508", 2],
         for(i = [-1, 1]) [ 17.38, 3*i, 90, "smd_soic", SOIC8, "" ]
@@ -1166,9 +1166,9 @@ L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3,
 PanelDue_v3 = ["PanelDue_v3", "Panel Due v3.0a LCD Display interface", 53, 73, 1.2, 0, 3.2, 0, "#2140BE", false, [[5,5], [5, -5], [43.7, 37.2]],
    [
     [ 45.0, 26.5,  45, "buzzer",     6, 12],
-    [ 32.8, 36.5,  90, "2p54socket", 20, 2],
+    [ 32.8, 36.5,  90, "socket2p54", 20, 2],
     [ 31.3,  5.9, 180, "molex_hdr",   4, 1],
-    [ 38.0, 53.2, -90, "2p54boxhdr",  5, 2, false, true, true],
+    [ 38.0, 53.2, -90, "boxhdr2p54",  5, 2, false, true, true],
     [ 40.8, 67.4,   0, "button_6mm"],
     [ 45.1, 16.5,   0, "button_6mm"],
     [ 51.2, 68.0,   0, "usb_uA"],
@@ -1251,8 +1251,8 @@ pcb("Feather405", "Adafruit Feather 405", [size.x, size.y, 1.6],
     grid = [inch(0.65), inch(0.05), 12, 2, gold, inch(0.1), inch(0.8),
             inch(0.25), inch(0.05), 4,  1, gold, inch(0.1), 0 ], //  grids of holes for the pins
     components = [
-        [size.x / 2, inch(0.05),   0, "-2p54header", 16, 1],
-        [inch(1.2), -inch(0.05),   0, "-2p54header", 12, 1],
+        [size.x / 2, inch(0.05),   0, "-header2p54", 16, 1],
+        [inch(1.2), -inch(0.05),   0, "-header2p54", 12, 1],
         [inch(1.3),  size.y / 2, -90, "smd_qfp", QFP50P1200X1200X160_64N, "STM32F405"],
         [ 3,         size.y / 2, 180, "usb_C"],
         [ 10,        -6.5,       180, "jst_ph", 2, true, grey(25) ],
@@ -1263,8 +1263,8 @@ pcb("Feather405", "Adafruit Feather 405", [size.x, size.y, 1.6],
 ESP_201 = let(size = [33.5, 25.5, 1.2], font = "Liberation Mono:style=Bold")
 pcb("ESP_201", "ESP-201 ESP8266 WiFi module", size, colour = "white",
     components = [
-        for(side = [-1, 1]) [2 + inch(0.5), size.y / 2 + side * inch(0.45), 0, "-2p54joiner", 11, 1],
-        [2 + inch(1.1),                size.y / 2, 90, "2p54header", 4, 1],
+        for(side = [-1, 1]) [2 + inch(0.5), size.y / 2 + side * inch(0.45), 0, "-joiner2p54", 11, 1],
+        [2 + inch(1.1),                size.y / 2, 90, "header2p54", 4, 1],
         [-1.5,                         size.y / 2,-90, "text", 10, 1, "3.3V RX TX GND", font, "black"],
         [2 + inch(0.5),                -3,          0, "text", inch(1) + 2, 1, "3.3V 3.3V IO4  D3   D1   D0   CMD  CLK  D2   IO2  IO0",  font, "black"],
         [2 + inch(0.5),                 3,        180, "text", inch(1) + 2, 1, "IO15 IO13 IO12 IO14 XPD  CPEN RST  TOUT IO5  GND  GND",  font, "black"],
@@ -1366,7 +1366,7 @@ tiny_buck = pcb("tiny_buck", "Ultra Small 3A buck regulator", [20, 11, 1.6],
     ]
 );
 
-9DOF_stick = pcb("9DOF_stick", "Sparkfun 9 degrees of freedom IMU", [24, 11, 0.8],
+SF_9DOF_stick = pcb("SF_9DOF_stick", "Sparkfun 9 degrees of freedom IMU", [24, 11, 0.8],
     colour = "red",
     hole_d = 3.3,
     holes = [[-1.2 - 3.3 / 2, 11 / 2]],
@@ -1379,7 +1379,7 @@ tiny_buck = pcb("tiny_buck", "Ultra Small 3A buck regulator", [20, 11, 1.6],
         [14.1, 4, 90, "smd_res", RES0603, "472"],
 
         // Silkscreen
-        [17.75, 1.4,   0,"text", 11, 1.4, "9DOF Stick",     "Liberation Sans:style=Bold"],
+        [17.75, 1.4,   0,"text", 11, 1.4, "SF_9DOF Stick",     "Liberation Sans:style=Bold"],
         [3,  11/2, 90, "text", 10, 1, "SCL SDA VDD GND", "Liberation Sans:style=Bold"],
     ],
     grid = [inch(0.05), 11 / 2 - inch(0.15), 1, 4, "silver", 0, inch(0.1)]
@@ -1389,8 +1389,8 @@ I2C_LCD_Backpack = let(size=[42, 19, 1.2])
   pcb("I2C_LCD_Backpack", "I2C / SPI character LCD backpack",
       size = size, //size
       colour = "black",
-      components = [[size[0]-2, -size[1]/2, 90, "2p54header", 4, 1, false, undef, true],
-                    [2, size[1]-8.5, 270, "2p54header", 2, 1, false, false, true],
+      components = [[size[0]-2, -size[1]/2, 90, "header2p54", 4, 1, false, undef, true],
+                    [2, size[1]-8.5, 270, "header2p54", 2, 1, false, false, true],
                     [size[0]/2,  size[1]/2,  90, "smd_soic", SOIC16, "PCF8574"],
                     [size[0]*3/4,  11,  0, "trimpot3362"],
                     // Silkscreen
@@ -1402,7 +1402,7 @@ I2C_LCD_Backpack = let(size=[42, 19, 1.2])
       grid = [2, size[1]-2, 16, 1, silver, inch(0.1), inch(0.9)]
       );
 
-tiny_pcbs = [ESP_201, ESP_01M, XIAO, ESP_12F, MP1584EN, ESP_01,tiny_buck, LIPO_fuel_gauge, 9DOF_stick];
+tiny_pcbs = [ESP_201, ESP_01M, XIAO, ESP_12F, MP1584EN, ESP_01,tiny_buck, LIPO_fuel_gauge, SF_9DOF_stick];
 
 big_pcbs = [BTT_RELAY_V1_2, MELLOW_FLY_D5, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
diff --git a/vitamins/pin_headers.scad b/vitamins/pin_headers.scad
index 6d1cd199..cf3b1682 100644
--- a/vitamins/pin_headers.scad
+++ b/vitamins/pin_headers.scad
@@ -24,13 +24,13 @@
 //                               h     l     w    w      c                     s                 t    y
 //                                                                  c     h    z                             o
 //                                                                                                           f
-2p54header  = ["2p54header",   2.54, 11.6, 3.2, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
-2p54joiner =  ["2p54joiner",   2.54, 7.5,  2.5, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ]; // Cropped pins for joining PCBs
+header2p54  = ["header2p54",   2.54, 11.6, 3.2, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
+joiner2p54 =  ["joiner2p54",   2.54, 7.5,  2.5, 0.66, gold,   grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ]; // Cropped pins for joining PCBs
 
 jst_xh_header = ["jst_xh_header",2.5,  10, 3.4, 0.64, gold,   "white", 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
 jst_ph_header = ["jst_ph_header",2.0,   9, 3.4, 0.64, silver, "white", 0,   [3.9, 4.5,  6],   0.5, 0.55,  0.25, 4.8];
 jst_zh_header = ["jst_zh_header",1.5, 7.4, 3.4, 0.5 , silver, "white", 0,   [3.0, 3.5,4.5],   0.5, 0.45,  0.25, 3.7];
 
-pin_headers = [ 2p54header ];
+pin_headers = [ header2p54 ];
 
 use <pin_header.scad>
diff --git a/vitamins/radials.scad b/vitamins/radials.scad
index 44106c2b..097c1319 100644
--- a/vitamins/radials.scad
+++ b/vitamins/radials.scad
@@ -39,10 +39,10 @@ rd_modules = [HF33F, VCE03, LDE10_20B];
 
 // Disks
 ERZV07D471 = ["ERZV07D471", "Varistor",          [6.5, 5.0, 8.0], [4.75, 3.1], [0.6,  1.4], [grey(20),  grey(80)]];
-6p4mm_disc = ["6p4mm_disc", "Ceramic capacitor", [6.5, 2.1, 7.8], [5.0,  0.9], [0.6,  0.8], ["#C5702D", grey(20)]];
-10mm_disc  = ["10mm_disc",  "Ceramic capacitor", [10,  4.25, 12], [7.72, 0],   [0.64, 2.0], ["#BA9C16", grey(20)]];
+disc_6p4mm = ["disc_6p4mm", "Ceramic capacitor", [6.5, 2.1, 7.8], [5.0,  0.9], [0.6,  0.8], ["#C5702D", grey(20)]];
+disc_10mm  = ["disc_10mm",  "Ceramic capacitor", [10,  4.25, 12], [7.72, 0],   [0.64, 2.0], ["#BA9C16", grey(20)]];
 
-rd_discs = [6p4mm_disc, ERZV07D471, 10mm_disc];
+rd_discs = [disc_6p4mm, ERZV07D471, disc_10mm];
 
 // Transistors
 TO92 =   ["TO92",   [5.0, 3.9, 4.5], [grey(20), grey(80)], [0.48, 0.48], [[-1,0], [0,0], [1,0]] ];
diff --git a/vitamins/servo_motors.scad b/vitamins/servo_motors.scad
index 9955ad81..f5c39f3d 100644
--- a/vitamins/servo_motors.scad
+++ b/vitamins/servo_motors.scad
@@ -17,16 +17,16 @@
 
 
 //                   type      w,  t,  boss,        pitch, screw dia
-80ST_faceplate = [ "80ST",     80, 8,  [70, 34, 3], 63.63, 6 ];
+faceplate_80ST = [ "80ST",     80, 8,  [70, 34, 3], 63.63, 6 ];
 
 //                   type,    dia, len, key length, width, depth
 Shaft_19mm_keyed = [ "keyed", 19,  35, [25, 6, 3.5] ];
 
 //                      Code,                   Description,                    Cap,         Length, Shaft,         Faceplate
-Lichuan_M01330_80ST = [ "Lichuan_M01330_80ST", "Lichuan LCMT07L02NB-80M01330B", [70, 3, 38], 123, Shaft_19mm_keyed, 80ST_faceplate ];
-Lichuan_M02430_80ST = [ "Lichuan_M02430_80ST", "Lichuan LCMT07L02NB-80M02430B", [70, 3, 38], 150, Shaft_19mm_keyed, 80ST_faceplate ];
-Lichuan_M03530_80ST = [ "Lichuan_M03530_80ST", "Lichuan LCMT07L02NB-80M03530B", [70, 3, 38], 178, Shaft_19mm_keyed, 80ST_faceplate ];
-Lichuan_M04030_80ST = [ "Lichuan_M04030_80ST", "Lichuan LCMT07L02NB-80M04030B", [70, 3, 38], 190, Shaft_19mm_keyed, 80ST_faceplate ];
+Lichuan_M01330_80ST = [ "Lichuan_M01330_80ST", "Lichuan LCMT07L02NB-80M01330B", [70, 3, 38], 123, Shaft_19mm_keyed, faceplate_80ST ];
+Lichuan_M02430_80ST = [ "Lichuan_M02430_80ST", "Lichuan LCMT07L02NB-80M02430B", [70, 3, 38], 150, Shaft_19mm_keyed, faceplate_80ST ];
+Lichuan_M03530_80ST = [ "Lichuan_M03530_80ST", "Lichuan LCMT07L02NB-80M03530B", [70, 3, 38], 178, Shaft_19mm_keyed, faceplate_80ST ];
+Lichuan_M04030_80ST = [ "Lichuan_M04030_80ST", "Lichuan LCMT07L02NB-80M04030B", [70, 3, 38], 190, Shaft_19mm_keyed, faceplate_80ST ];
 
 servo_motors = [Lichuan_M01330_80ST, Lichuan_M02430_80ST, Lichuan_M03530_80ST, Lichuan_M04030_80ST];