diff --git a/fab.dcm b/fab.dcm
index 5894dad4df95c0289d80179018bcc0fbd4955e7d..21ff07920230b54a3a345aeb6987a1776efa40ef 100644
--- a/fab.dcm
+++ b/fab.dcm
@@ -190,6 +190,12 @@ K connector
 F https://cdn.amphenol-icc.com/media/wysiwyg/files/drawing/20021121.pdf
 $ENDCMP
 #
+$CMP Conn_DCPowerJack_ID2mm_OD5.5mm_CUI_PJ-002AH-SMT-TR
+D DC Barrel Jack with an internal switch
+K DC power barrel jack connector
+F https://www.cuidevices.com/product/resource/pj-002ah-smt-tr.pdf
+$ENDCMP
+#
 $CMP Conn_FTDI_01x06_Male
 D Male FTDI connector
 K male FTDI connector
@@ -244,12 +250,6 @@ K dac i2c
 F www.adafruit.com/datasheets/mcp4725.pdf
 $ENDCMP
 #
-$CMP DC_Power_Jack_CUI_PJ-002AH-SMT-TR
-D DC Barrel Jack with an internal switch
-K DC power barrel jack connector
-F https://www.cuidevices.com/product/resource/pj-002ah-smt-tr.pdf
-$ENDCMP
-#
 $CMP D_Schottky
 D Schottky diode
 K diode schottky
diff --git a/fab.lib b/fab.lib
index 6a43b92e9853a894b2dd7b97267e0379b23d5e62..81bd1d2031bff6e7903e3e9752602b25938b0129 100644
--- a/fab.lib
+++ b/fab.lib
@@ -1102,6 +1102,31 @@ X Pin_9 9 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Conn_DCPowerJack_ID2mm_OD5.5mm_CUI_PJ-002AH-SMT-TR
+#
+DEF Conn_DCPowerJack_ID2mm_OD5.5mm_CUI_PJ-002AH-SMT-TR J 0 20 Y N 1 F N
+F0 "J" 0 210 50 H V C CNN
+F1 "Conn_DCPowerJack_ID2mm_OD5.5mm_CUI_PJ-002AH-SMT-TR" 0 -200 50 H V C CNN
+F2 "fab:CUIDevices_PJ-002AH-SMT-TR_DCPowerJack_ID2mm_OD5.5mm" 50 -40 50 H I C CNN
+F3 "" 50 -40 50 H I C CNN
+$FPLIST
+ BarrelJack*
+$ENDFPLIST
+DRAW
+A -130 100 25 901 -901 0 1 10 F -130 125 -130 75
+A -130 100 25 901 -901 0 1 10 N -130 125 -130 75
+S -200 150 200 -150 0 1 10 f
+S 145 125 -130 75 0 1 10 F
+P 2 0 1 10 50 -90 75 -65 N
+P 2 0 1 10 200 100 150 100 N
+P 4 0 1 10 200 0 50 0 50 -90 25 -65 N
+P 6 0 1 10 -150 -100 -100 -100 -50 -50 0 -100 100 -100 200 -100 N
+X ~ 1 300 100 100 L 50 50 1 1 P
+X ~ 2 300 -100 100 L 50 50 1 1 P
+X ~ 3 300 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Conn_FTDI_01x06_Male
 #
 DEF Conn_FTDI_01x06_Male J 0 40 Y Y 1 F N
@@ -1341,31 +1366,6 @@ X A0 6 -400 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# DC_Power_Jack_CUI_PJ-002AH-SMT-TR
-#
-DEF DC_Power_Jack_CUI_PJ-002AH-SMT-TR J 0 20 Y N 1 F N
-F0 "J" 0 210 50 H V C CNN
-F1 "DC_Power_Jack_CUI_PJ-002AH-SMT-TR" 0 -200 50 H V C CNN
-F2 "fab:DC_Power_Jack_CUI_PJ-002AH-SMT-TR" 50 -40 50 H I C CNN
-F3 "" 50 -40 50 H I C CNN
-$FPLIST
- BarrelJack*
-$ENDFPLIST
-DRAW
-A -130 100 25 901 -901 0 1 10 F -130 125 -130 75
-A -130 100 25 901 -901 0 1 10 N -130 125 -130 75
-S -200 150 200 -150 0 1 10 f
-S 145 125 -130 75 0 1 10 F
-P 2 0 1 10 50 -90 75 -65 N
-P 2 0 1 10 200 100 150 100 N
-P 4 0 1 10 200 0 50 0 50 -90 25 -65 N
-P 6 0 1 10 -150 -100 -100 -100 -50 -50 0 -100 100 -100 200 -100 N
-X ~ 1 300 100 100 L 50 50 1 1 P
-X ~ 2 300 -100 100 L 50 50 1 1 P
-X ~ 3 300 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # D_Schottky
 #
 DEF D_Schottky D 0 40 N N 1 F N
diff --git a/fab.pretty/DC_Power_Jack_CUI_PJ-002AH-SMT-TR.kicad_mod b/fab.pretty/CUIDevices_PJ-002AH-SMT-TR_DCPowerJack_ID2mm_OD5.5mm.kicad_mod
similarity index 89%
rename from fab.pretty/DC_Power_Jack_CUI_PJ-002AH-SMT-TR.kicad_mod
rename to fab.pretty/CUIDevices_PJ-002AH-SMT-TR_DCPowerJack_ID2mm_OD5.5mm.kicad_mod
index 72cd2e34850d7398743c4e035e0babbf7e376073..b92de297eba1e64bfc7e6dfc066a25c422802393 100644
--- a/fab.pretty/DC_Power_Jack_CUI_PJ-002AH-SMT-TR.kicad_mod
+++ b/fab.pretty/CUIDevices_PJ-002AH-SMT-TR_DCPowerJack_ID2mm_OD5.5mm.kicad_mod
@@ -1,37 +1,37 @@
-(module DC_Power_Jack_CUI_PJ-002AH-SMT-TR (layer F.Cu) (tedit 60634B93)
-  (descr "Surface-mount DC Barrel Jack, https://www.cliffuk.co.uk/products/dcconnectors/FC681465S.pdf")
-  (tags "Power Jack SMT")
+(module CUIDevices_PJ-002AH-SMT-TR_DCPowerJack_ID2mm_OD5.5mm (layer F.Cu) (tedit 60843842)
+  (descr "Surface-mount DC Barrel Jack")
+  (tags "Power Jack SMT SMD")
   (attr smd)
   (fp_text reference REF** (at -6.5 6.5 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value DC_Power_Jack_CUI_PJ-002AH-SMT-TR (at -0.5 8.5 180) (layer F.Fab)
+  (fp_text value CUIDevices_PJ-002AH-SMT-TR (at -0.5 8.5 180) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -4.3 -7.5) (end -4.3 -5.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.96 -7.5) (end -4.3 -7.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8 4.5) (end -8 -4.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -4.5) (end 6.7 -4.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.7 4.5) (end 6.7 -4.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -8 4.5) (end 6.7 4.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -8 -4.5) (end -4.6 -4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8 4.5) (end -4.39 4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8 4.5) (end -8 -4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8.5 7.8) (end 7.2 7.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.2 7.8) (end 7.2 -7.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8.5 -7.8) (end 7.2 -7.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8.5 7.8) (end -8.5 -7.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8 -4.5) (end -4 -4.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -4.5) (end -3 -3.5) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.5 4.5) (end 4.8 4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.5 -4.5) (end 6.5 4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.7 -4.5) (end 6.5 -4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.4 4.5) (end 1.4 4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.4 -4.5) (end 1.4 -4.5) (layer F.SilkS) (width 0.12))
   (fp_line (start -3 -3.5) (end -2 -4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -4 -4.5) (end -3 -3.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -8 -4.5) (end -4 -4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -8.5 7.8) (end -8.5 -7.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -8.5 -7.8) (end 7.2 -7.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 7.2 7.8) (end 7.2 -7.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -8.5 7.8) (end 7.2 7.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -8 4.5) (end -8 -4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -8 4.5) (end -4.39 4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -8 -4.5) (end -4.6 -4.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -8 4.5) (end 6.7 4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.7 4.5) (end 6.7 -4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -2 -4.5) (end 6.7 -4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -8 4.5) (end -8 -4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.96 -7.5) (end -4.3 -7.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.3 -7.5) (end -4.3 -5.36) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at -0.5 0.5 180) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1.4 -4.5) (end 1.4 -4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.4 4.5) (end 1.4 4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.7 -4.5) (end 6.5 -4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.5 -4.5) (end 6.5 4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.5 4.5) (end 4.8 4.5) (layer F.SilkS) (width 0.12))
   (pad "" np_thru_hole circle (at -3 0 90) (size 2 2) (drill 2) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 1.5 0 90) (size 2 2) (drill 2) (layers *.Cu *.Mask))
   (pad 1 smd rect (at -3 -5.7 90) (size 3 2) (layers F.Cu F.Paste F.Mask))