diff --git a/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
index ab356a454..04f98c457 100644
--- a/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0201_0603Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0201_0603Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0201 (0603 Metric), IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
index 15a4f7a49..97db42f5d 100644
--- a/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0201_0603Metric_Pad0.50x0.40mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0201_0603Metric_Pad0.50x0.40mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0201 (0603 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -21,7 +21,7 @@
   (fp_text user %R (at 0 -0.78) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0201_0603Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
index 13d4752a3..cfb94c81d 100644
--- a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0402_1005Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0402_1005Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0402 (1005 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
index 49ed9f52c..d7830e864 100644
--- a/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0402_1005Metric_Pad0.73x0.65mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0402_1005Metric_Pad0.73x0.65mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0402 (1005 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -21,7 +21,7 @@
   (fp_text user %R (at 0 -0.88) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0402_1005Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
index 7aad0b13e..7f19c2f91 100644
--- a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0603_1608Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0603_1608Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0603 (1608 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
index bbe8c41f4..36e19514a 100644
--- a/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0603_1608Metric_Pad0.82x1.00mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0603_1608Metric_Pad0.82x1.00mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0603 (1608 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0603_1608Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
index 773363ac5..8f397f104 100644
--- a/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0612_1632Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0612_1632Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0612 (1632 Metric), IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
index b6db8f644..6821a9567 100644
--- a/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0612_1632Metric_Pad1.07x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0612_1632Metric_Pad1.07x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0612 (1632 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -21,7 +21,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0612_1632Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0612_1632Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
index e30ff3bdd..5f13068c8 100644
--- a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0805_2012Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0805_2012Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0805 (2012 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
index badb89c3c..fbe89f820 100644
--- a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0805_2012Metric_Pad1.12x1.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0805_2012Metric_Pad1.12x1.50mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0805 (2012 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0805_2012Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod b/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
index bec51a5ff..4b72861ee 100644
--- a/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0815_2037Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_0815_2037Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0815 (2037 Metric), IPC_7351 nominal, (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
index 674221177..afb76577e 100644
--- a/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0815_2037Metric_Pad1.46x4.10mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_0815_2037Metric_Pad1.46x4.10mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 0815 (2037 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -21,7 +21,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.54 0.54) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0815_2037Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0815_2037Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod b/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
index 30d3d4105..ce033a1c3 100644
--- a/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1020_1632Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_1020_1632Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1020 (1632 Metric), IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
index 96bc154c3..da19504f8 100644
--- a/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1020_1632Metric_Pad1.22x5.30mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_1020_1632Metric_Pad1.22x5.30mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1020 (1632 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.62 0.62) (thickness 0.09)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1020_1632Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1020_1632Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
index 01b50431a..56f4dc89f 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1206_3216Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_1206_3216Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1206 (3216 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
index 67cb71e28..de9f10916 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1206_3216Metric_Pad1.22x1.80mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_1206_3216Metric_Pad1.22x1.80mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1206 (3216 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1206_3216Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
index c8391812f..f16eb9e5b 100644
--- a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1210_3225Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_1210_3225Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1210 (3225 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
index d0a7aa5aa..87b3a76db 100644
--- a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1210_3225Metric_Pad1.22x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_1210_3225Metric_Pad1.22x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1210 (3225 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1210_3225Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1210_3225Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
index 7606a5140..9d8bc454a 100644
--- a/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1218_3246Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_1218_3246Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1218 (3246 Metric), IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
index ed13fa4c4..dc05a4787 100644
--- a/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1218_3246Metric_Pad1.12x5.80mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_1218_3246Metric_Pad1.12x5.80mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1218 (3246 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1218_3246Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1218_3246Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
index 115b76c29..a0dcec21d 100644
--- a/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1812_4532Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_1812_4532Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1812 (4532 Metric), IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
index b13eb7d2e..3a60e80ab 100644
--- a/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1812_4532Metric_Pad1.22x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_1812_4532Metric_Pad1.22x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 1812 (4532 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1812_4532Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1812_4532Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
index 180f2f67f..b2f41624d 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2010_5025Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_2010_5025Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2010 (5025 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
index 128c91746..6283375a6 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2010_5025Metric_Pad1.32x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_2010_5025Metric_Pad1.32x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2010 (5025 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2010_5025Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2010_5025Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
index 63a1723b5..df19c7aed 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2512_6332Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_2512_6332Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2512 (6332 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
index b62e373b0..4cb45b868 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2512_6332Metric_Pad1.32x3.40mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_2512_6332Metric_Pad1.32x3.40mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2512 (6332 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2512_6332Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2512_6332Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
index ac0ba4165..8964de665 100644
--- a/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2816_7142Metric (layer F.Cu) (tedit 59FCCDB2)
+(module R_2816_7142Metric (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2816 (7142 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
index 8a960b4e1..83e5b2bc0 100644
--- a/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2816_7142Metric_Pad2.39x4.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
+(module R_2816_7142Metric_Pad2.39x4.50mm_HandSolder (layer F.Cu) (tedit 59FCCF55)
   (descr "Resistor SMD 2816 (7142 Metric), IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2816_7142Metric.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2816_7142Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))