From 84694683f87f3f435f3c0800a4a9988e3335a94e Mon Sep 17 00:00:00 2001
From: Sean Cross <sean@xobs.io>
Date: Mon, 25 Mar 2019 13:19:59 +0800
Subject: [PATCH] rescue: remove that file and remove "-rescue" suffix

It's still not clear why it needs to do this every time.  Kicad quirk,
I guess.

Signed-off-by: Sean Cross <sean@xobs.io>
---
 hardware/pcb/tomu-fpga-cache.lib  |  60 ++++-----
 hardware/pcb/tomu-fpga-rescue.dcm |   3 -
 hardware/pcb/tomu-fpga-rescue.lib | 198 ------------------------------
 hardware/pcb/tomu-fpga.sch        |  54 ++++----
 4 files changed, 57 insertions(+), 258 deletions(-)
 delete mode 100644 hardware/pcb/tomu-fpga-rescue.dcm
 delete mode 100644 hardware/pcb/tomu-fpga-rescue.lib

diff --git a/hardware/pcb/tomu-fpga-cache.lib b/hardware/pcb/tomu-fpga-cache.lib
index 454c5e7..c890f92 100644
--- a/hardware/pcb/tomu-fpga-cache.lib
+++ b/hardware/pcb/tomu-fpga-cache.lib
@@ -145,11 +145,11 @@ X pwr 1 0 0 0 U 50 50 0 0 w
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_Case-tomu-fpga
+# tomu-fpga_Case-tomu-fpga
 #
-DEF tomu-fpga-rescue_Case-tomu-fpga XX 0 40 Y Y 1 F N
+DEF tomu-fpga_Case-tomu-fpga XX 0 40 Y Y 1 F N
 F0 "XX" 0 0 50 H V C CNN
-F1 "tomu-fpga-rescue_Case-tomu-fpga" 0 -100 50 H V C CNN
+F1 "tomu-fpga_Case-tomu-fpga" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -162,11 +162,11 @@ P 2 0 1 0 50 150 100 100 N
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_ICE40UP5K-UWG30-tomu-fpga
+# tomu-fpga_ICE40UP5K-UWG30-tomu-fpga
 #
-DEF tomu-fpga-rescue_ICE40UP5K-UWG30-tomu-fpga U 0 40 Y Y 4 L N
+DEF tomu-fpga_ICE40UP5K-UWG30-tomu-fpga U 0 40 Y Y 4 L N
 F0 "U" -200 -550 60 H V R CNN
-F1 "tomu-fpga-rescue_ICE40UP5K-UWG30-tomu-fpga" 500 -650 60 H V R CNN
+F1 "tomu-fpga_ICE40UP5K-UWG30-tomu-fpga" 500 -650 60 H V R CNN
 F2 "" 250 -200 50 V I C CNN
 F3 "" 250 -200 50 V I C CNN
 DRAW
@@ -207,11 +207,11 @@ X GND E2 600 -300 200 L 50 50 4 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_LDO-X2SON-tomu-fpga
+# tomu-fpga_LDO-X2SON-tomu-fpga
 #
-DEF tomu-fpga-rescue_LDO-X2SON-tomu-fpga U 0 40 Y Y 1 F N
+DEF tomu-fpga_LDO-X2SON-tomu-fpga U 0 40 Y Y 1 F N
 F0 "U" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_LDO-X2SON-tomu-fpga" 0 -150 50 H V C CNN
+F1 "tomu-fpga_LDO-X2SON-tomu-fpga" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -224,11 +224,11 @@ X Thermal 5 300 150 100 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_Oscillator-tomu-fpga
+# tomu-fpga_Oscillator-tomu-fpga
 #
-DEF tomu-fpga-rescue_Oscillator-tomu-fpga U 0 40 Y Y 1 F N
+DEF tomu-fpga_Oscillator-tomu-fpga U 0 40 Y Y 1 F N
 F0 "U" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_Oscillator-tomu-fpga" 0 -150 50 H V C CNN
+F1 "tomu-fpga_Oscillator-tomu-fpga" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -243,11 +243,11 @@ X VDD 4 350 250 100 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_PADS-tomu-fpga
+# tomu-fpga_PADS-tomu-fpga
 #
-DEF tomu-fpga-rescue_PADS-tomu-fpga P 0 40 Y Y 1 F N
+DEF tomu-fpga_PADS-tomu-fpga P 0 40 Y Y 1 F N
 F0 "P" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_PADS-tomu-fpga" 0 -150 50 H V C CNN
+F1 "tomu-fpga_PADS-tomu-fpga" 0 -150 50 H V C CNN
 F2 "" 50 0 50 H I C CNN
 F3 "" 50 0 50 H I C CNN
 DRAW
@@ -259,11 +259,11 @@ X ~ 4 -200 50 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_RGB-LED-tomu-fpga
+# tomu-fpga_RGB-LED-tomu-fpga
 #
-DEF tomu-fpga-rescue_RGB-LED-tomu-fpga U 0 40 Y Y 1 F N
+DEF tomu-fpga_RGB-LED-tomu-fpga U 0 40 Y Y 1 F N
 F0 "U" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_RGB-LED-tomu-fpga" 0 -150 50 H V C CNN
+F1 "tomu-fpga_RGB-LED-tomu-fpga" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -275,11 +275,11 @@ X VCC 4 -350 250 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_SPI-Flash-tomu-fpga
+# tomu-fpga_SPI-Flash-tomu-fpga
 #
-DEF tomu-fpga-rescue_SPI-Flash-tomu-fpga U 0 40 Y Y 1 F N
+DEF tomu-fpga_SPI-Flash-tomu-fpga U 0 40 Y Y 1 F N
 F0 "U" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_SPI-Flash-tomu-fpga" 0 -150 50 H V C CNN
+F1 "tomu-fpga_SPI-Flash-tomu-fpga" 0 -150 50 H V C CNN
 F2 "" -200 0 50 H I C CNN
 F3 "" -200 0 50 H I C CNN
 DRAW
@@ -295,11 +295,11 @@ X VCC 8 -600 550 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_Testpoint-tomu-fpga
+# tomu-fpga_Testpoint-tomu-fpga
 #
-DEF tomu-fpga-rescue_Testpoint-tomu-fpga TP 0 40 Y Y 1 F N
+DEF tomu-fpga_Testpoint-tomu-fpga TP 0 40 Y Y 1 F N
 F0 "TP" 0 -50 50 H V C CNN
-F1 "tomu-fpga-rescue_Testpoint-tomu-fpga" 0 -100 50 H V C CNN
+F1 "tomu-fpga_Testpoint-tomu-fpga" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -308,11 +308,11 @@ X ~ 1 -150 50 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_Touchpad-Note-tomu-fpga
+# tomu-fpga_Touchpad-Note-tomu-fpga
 #
-DEF tomu-fpga-rescue_Touchpad-Note-tomu-fpga XX 0 40 Y Y 1 F N
+DEF tomu-fpga_Touchpad-Note-tomu-fpga XX 0 40 Y Y 1 F N
 F0 "XX" 0 0 50 H V C CNN
-F1 "tomu-fpga-rescue_Touchpad-Note-tomu-fpga" 0 -100 50 H V C CNN
+F1 "tomu-fpga_Touchpad-Note-tomu-fpga" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -323,11 +323,11 @@ P 4 0 1 0 0 150 0 250 50 250 50 200 N
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga-rescue_USB-B-tomu-fpga
+# tomu-fpga_USB-B-tomu-fpga
 #
-DEF tomu-fpga-rescue_USB-B-tomu-fpga U 0 40 Y Y 1 F N
+DEF tomu-fpga_USB-B-tomu-fpga U 0 40 Y Y 1 F N
 F0 "U" 0 0 50 H V C CNN
-F1 "tomu-fpga-rescue_USB-B-tomu-fpga" 0 -100 50 H V C CNN
+F1 "tomu-fpga_USB-B-tomu-fpga" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
diff --git a/hardware/pcb/tomu-fpga-rescue.dcm b/hardware/pcb/tomu-fpga-rescue.dcm
deleted file mode 100644
index 5dd71cb..0000000
--- a/hardware/pcb/tomu-fpga-rescue.dcm
+++ /dev/null
@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library
diff --git a/hardware/pcb/tomu-fpga-rescue.lib b/hardware/pcb/tomu-fpga-rescue.lib
deleted file mode 100644
index e8b9d47..0000000
--- a/hardware/pcb/tomu-fpga-rescue.lib
+++ /dev/null
@@ -1,198 +0,0 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# Case-tomu-fpga
-#
-DEF Case-tomu-fpga XX 0 40 Y Y 1 F N
-F0 "XX" 0 0 50 H V C CNN
-F1 "Case-tomu-fpga" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -50 100 50 50 0 1 0 f
-S 50 50 50 50 0 1 0 N
-P 2 0 1 0 -50 150 -100 100 N
-P 2 0 1 0 0 100 -50 150 N
-P 2 0 1 0 0 100 50 150 N
-P 2 0 1 0 50 150 100 100 N
-ENDDRAW
-ENDDEF
-#
-# ICE40UP5K-UWG30-tomu-fpga
-#
-DEF ICE40UP5K-UWG30-tomu-fpga U 0 40 Y Y 4 L N
-F0 "U" -200 -550 60 H V R CNN
-F1 "ICE40UP5K-UWG30-tomu-fpga" 500 -650 60 H V R CNN
-F2 "" 250 -200 50 V I C CNN
-F3 "" 250 -200 50 V I C CNN
-DRAW
-S -350 600 450 -500 1 1 12 f
-S -400 1000 700 -500 2 1 12 f
-S -400 300 100 -500 3 1 12 f
-S -400 -500 400 -100 4 1 12 f
-X IOT_36b A1 -550 200 200 R 50 50 1 1 B
-X IOT_37a A2 -550 100 200 R 50 50 1 1 B
-X VCCIO_0 A3 50 800 200 D 50 50 1 1 W
-X IOT_47a A4 -550 -100 200 R 50 50 1 1 B
-X RGB0 A5 -550 -200 200 R 50 50 1 1 C
-X IOT_46b_G0 B3 -550 0 200 R 50 50 1 1 B
-X RGB1 B5 -550 -300 200 R 50 50 1 1 C
-X RGB2 C5 -550 -400 200 R 50 50 1 1 C
-X IOB_24a B1 -600 50 200 R 50 50 2 1 B
-X IOB_35b_SPI_SS C1 -600 -450 200 R 50 50 2 1 B
-X IOB_10a C3 -600 550 200 R 50 50 2 1 B
-X IOB_34a_SPI_SCK D1 -600 -350 200 R 50 50 2 1 B
-X SPI_Vccio1 D2 150 1200 200 D 50 50 2 1 W
-X IOB_12a_G4_CDONE D3 -600 250 200 R 50 50 2 1 B
-X IOB_33b_SPI_SI E1 -600 -250 200 R 50 50 2 1 B
-X IOB_13b E3 -600 150 200 R 50 50 2 1 B
-X IOB_32a_SPI_SO F1 -600 -150 200 R 50 50 2 1 B
-X IOB_25b_G3 F2 -600 -50 200 R 50 50 2 1 B
-X CRESET F3 -600 350 200 R 50 50 2 1 I I
-X IOB_11b_G5 F4 -600 450 200 R 50 50 2 1 B
-X VCCIO_2 C4 0 500 200 D 50 50 3 1 W
-X IOB_2a D5 -600 -200 200 R 50 50 3 1 B
-X IOB_9b E4 -600 -400 200 R 50 50 3 1 B
-X IOB_0a E5 -600 -100 200 R 50 50 3 1 B
-X IOB_3b_G6 F5 -600 -300 200 R 50 50 3 1 B
-X VCCPLL B2 -600 -200 200 R 50 50 4 1 W
-X GND B4 600 -400 200 L 50 50 4 1 W
-X VCC C2 -600 -300 200 R 50 50 4 1 W
-X VPP_2V5 D4 -600 -400 200 R 50 50 4 1 W
-X GND E2 600 -300 200 L 50 50 4 1 W
-ENDDRAW
-ENDDEF
-#
-# LDO-X2SON-tomu-fpga
-#
-DEF LDO-X2SON-tomu-fpga U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "LDO-X2SON-tomu-fpga" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -200 350 200 0 0 1 0 f
-X OUT 1 300 300 100 L 50 50 1 1 w
-X GND 2 300 50 100 L 50 50 1 1 W
-X EN 3 -300 50 100 R 50 50 1 1 I
-X IN 4 -300 300 100 R 50 50 1 1 W
-X Thermal 5 300 150 100 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# Oscillator-tomu-fpga
-#
-DEF Oscillator-tomu-fpga U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "Oscillator-tomu-fpga" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- oscillator
-$ENDFPLIST
-DRAW
-S -250 300 250 0 0 1 0 f
-X OE 1 -350 250 100 R 50 50 1 1 I
-X GND 2 350 50 100 L 50 50 1 1 W
-X OUT 3 -350 50 100 R 50 50 1 1 O
-X VDD 4 350 250 100 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# PADS-tomu-fpga
-#
-DEF PADS-tomu-fpga P 0 40 Y Y 1 F N
-F0 "P" 0 -50 50 H V C CNN
-F1 "PADS-tomu-fpga" 0 -150 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
-DRAW
-S -100 400 100 0 0 1 0 f
-X ~ 1 -200 350 100 R 50 50 1 1 P
-X ~ 2 -200 250 100 R 50 50 1 1 P
-X ~ 3 -200 150 100 R 50 50 1 1 P
-X ~ 4 -200 50 100 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# RGB-LED-tomu-fpga
-#
-DEF RGB-LED-tomu-fpga U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "RGB-LED-tomu-fpga" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -250 300 300 0 0 1 0 f
-X Blue 1 400 250 100 L 50 50 1 1 I
-X Green 2 400 150 100 L 50 50 1 1 I
-X Red 3 400 50 100 L 50 50 1 1 I
-X VCC 4 -350 250 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# SPI-Flash-tomu-fpga
-#
-DEF SPI-Flash-tomu-fpga U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "SPI-Flash-tomu-fpga" 0 -150 50 H V C CNN
-F2 "" -200 0 50 H I C CNN
-F3 "" -200 0 50 H I C CNN
-DRAW
-S -500 650 550 0 0 1 0 f
-X /CS 1 650 50 100 L 50 50 1 1 I I
-X MISO_IO1 2 650 250 100 L 50 50 1 1 O
-X /WP_IO2 3 650 450 100 L 50 50 1 1 B I
-X GND 4 -600 50 100 R 50 50 1 1 W
-X MOSI_IO0 5 650 350 100 L 50 50 1 1 I
-X CLK 6 650 150 100 L 50 50 1 1 I
-X /HOLD_IO3 7 650 550 100 L 50 50 1 1 B I
-X VCC 8 -600 550 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# Testpoint-tomu-fpga
-#
-DEF Testpoint-tomu-fpga TP 0 40 Y Y 1 F N
-F0 "TP" 0 -50 50 H V C CNN
-F1 "Testpoint-tomu-fpga" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -50 100 0 0 0 1 0 f
-X ~ 1 -150 50 100 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Touchpad-Note-tomu-fpga
-#
-DEF Touchpad-Note-tomu-fpga XX 0 40 Y Y 1 F N
-F0 "XX" 0 0 50 H V C CNN
-F1 "Touchpad-Note-tomu-fpga" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 100 50 0 1 0 f
-P 3 0 1 0 0 250 -50 250 -50 200 N
-P 3 0 1 0 50 200 0 250 -50 200 N
-P 4 0 1 0 0 150 0 250 50 250 50 200 N
-ENDDRAW
-ENDDEF
-#
-# USB-B-tomu-fpga
-#
-DEF USB-B-tomu-fpga U 0 40 Y Y 1 F N
-F0 "U" 0 0 50 H V C CNN
-F1 "USB-B-tomu-fpga" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S 300 450 -300 50 0 1 0 f
-X VUSB 1 -400 100 100 R 50 50 1 1 w
-X USBDN 2 -400 200 100 R 50 50 1 1 B
-X USBDP 3 -400 300 100 R 50 50 1 1 B
-X GND 4 -400 400 100 R 50 50 1 1 w
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/hardware/pcb/tomu-fpga.sch b/hardware/pcb/tomu-fpga.sch
index a8603b1..b087e61 100644
--- a/hardware/pcb/tomu-fpga.sch
+++ b/hardware/pcb/tomu-fpga.sch
@@ -326,7 +326,7 @@ Wire Wire Line
 	900  2100 1150 2100
 Connection ~ 1150 2100
 $Comp
-L tomu-fpga-rescue:USB-B-tomu-fpga U9
+L tomu-fpga:USB-B-tomu-fpga U9
 U 1 1 5BD8B24F
 P 8300 1600
 F 0 "U9" H 8550 1600 50  0000 C CNN
@@ -366,7 +366,7 @@ F 3 "" H 8850 1100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L tomu-fpga-rescue:RGB-LED-tomu-fpga U10
+L tomu-fpga:RGB-LED-tomu-fpga U10
 U 1 1 5BD90F18
 P 8550 2850
 F 0 "U10" H 8350 2800 50  0000 C CNN
@@ -511,7 +511,7 @@ F 3 "" H 6450 950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L tomu-fpga-rescue:PADS-tomu-fpga SW2
+L tomu-fpga:PADS-tomu-fpga SW2
 U 1 1 5BE44C19
 P 5300 1200
 F 0 "SW2" V 5550 1500 50  0000 C CNN
@@ -915,7 +915,7 @@ Connection ~ 9500 6100
 Wire Wire Line
 	9500 6100 9500 6150
 $Comp
-L tomu-fpga-rescue:Oscillator-tomu-fpga U7
+L tomu-fpga:Oscillator-tomu-fpga U7
 U 1 1 5C0E8D0F
 P 1400 5600
 F 0 "U7" H 1150 5550 50  0000 C CNN
@@ -994,7 +994,7 @@ SPI_IO3
 Text Label 2300 6250 0    50   ~ 0
 CDONE
 $Comp
-L tomu-fpga-rescue:ICE40UP5K-UWG30-tomu-fpga U5
+L tomu-fpga:ICE40UP5K-UWG30-tomu-fpga U5
 U 3 1 5C122A3A
 P 6450 1750
 F 0 "U5" H 6050 1200 50  0000 L CNN
@@ -1009,7 +1009,7 @@ F 7 "ICE40-ULTRAPLUS, 5280 LUTS, 1.2V" H 200 -300 50  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L tomu-fpga-rescue:ICE40UP5K-UWG30-tomu-fpga U5
+L tomu-fpga:ICE40UP5K-UWG30-tomu-fpga U5
 U 4 1 5C122B60
 P 10200 4800
 F 0 "U5" H 9850 4250 50  0000 C CNN
@@ -1024,7 +1024,7 @@ F 7 "ICE40-ULTRAPLUS, 5280 LUTS, 1.2V" H 200 -400 50  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L tomu-fpga-rescue:SPI-Flash-tomu-fpga U4
+L tomu-fpga:SPI-Flash-tomu-fpga U4
 U 1 1 5C1645BF
 P 1650 7000
 F 0 "U4" H 1675 7815 50  0000 C CNN
@@ -1130,7 +1130,7 @@ Wire Wire Line
 Wire Wire Line
 	4950 2150 5850 2150
 $Comp
-L tomu-fpga-rescue:ICE40UP5K-UWG30-tomu-fpga U5
+L tomu-fpga:ICE40UP5K-UWG30-tomu-fpga U5
 U 1 1 5C1225F9
 P 10400 2400
 F 0 "U5" H 10100 1250 50  0000 L CNN
@@ -1149,7 +1149,7 @@ Wire Wire Line
 Text Notes 1150 7400 0    50   ~ 0
 To program SPI flash, put FPGA in RESET\nTo program FPGA, keep SPI_IO3 LOW
 $Comp
-L tomu-fpga-rescue:LDO-X2SON-tomu-fpga U1
+L tomu-fpga:LDO-X2SON-tomu-fpga U1
 U 1 1 5BF1A34B
 P 1650 1300
 F 0 "U1" H 1650 1850 50  0000 C CNN
@@ -1174,7 +1174,7 @@ Wire Wire Line
 Wire Wire Line
 	2050 1150 2050 1250
 $Comp
-L tomu-fpga-rescue:LDO-X2SON-tomu-fpga U2
+L tomu-fpga:LDO-X2SON-tomu-fpga U2
 U 1 1 5BF61C95
 P 1650 2400
 F 0 "U2" H 1650 2925 50  0000 C CNN
@@ -1200,7 +1200,7 @@ Wire Wire Line
 Wire Wire Line
 	1300 1800 1300 2350
 $Comp
-L tomu-fpga-rescue:LDO-X2SON-tomu-fpga U3
+L tomu-fpga:LDO-X2SON-tomu-fpga U3
 U 1 1 5BFAB7F1
 P 1650 3500
 F 0 "U3" H 1650 4025 50  0000 C CNN
@@ -1222,7 +1222,7 @@ Connection ~ 2050 3450
 Wire Wire Line
 	2050 3450 2050 3600
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP2
+L tomu-fpga:Testpoint-tomu-fpga TP2
 U 1 1 5C03018F
 P 5250 4500
 F 0 "TP2" H 5400 4550 50  0000 C CNN
@@ -1240,7 +1240,7 @@ SPI_MOSI
 Text Label 5450 4700 0    50   ~ 0
 SPI_MISO
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP3
+L tomu-fpga:Testpoint-tomu-fpga TP3
 U 1 1 5C042DE8
 P 5250 4650
 F 0 "TP3" H 5400 4700 50  0000 C CNN
@@ -1254,7 +1254,7 @@ $EndComp
 Wire Wire Line
 	5400 4700 5850 4700
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP4
+L tomu-fpga:Testpoint-tomu-fpga TP4
 U 1 1 5C068EF3
 P 5250 4800
 F 0 "TP4" H 5400 4850 50  0000 C CNN
@@ -1268,7 +1268,7 @@ $EndComp
 Wire Wire Line
 	5400 4850 5850 4850
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP5
+L tomu-fpga:Testpoint-tomu-fpga TP5
 U 1 1 5C068EFC
 P 5250 4950
 F 0 "TP5" H 5400 5000 50  0000 C CNN
@@ -1290,7 +1290,7 @@ SPI_IO2
 Text Label 5450 5300 0    50   ~ 0
 SPI_IO3
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP6
+L tomu-fpga:Testpoint-tomu-fpga TP6
 U 1 1 5C07C50C
 P 5250 5100
 F 0 "TP6" H 5400 5150 50  0000 C CNN
@@ -1302,7 +1302,7 @@ F 4 "X" H 0   0   50  0001 C CNN "DNP"
 	-1   0    0    1   
 $EndComp
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP7
+L tomu-fpga:Testpoint-tomu-fpga TP7
 U 1 1 5C07C63D
 P 5250 5250
 F 0 "TP7" H 5400 5300 50  0000 C CNN
@@ -1320,7 +1320,7 @@ Wire Wire Line
 Text Label 5450 5450 0    50   ~ 0
 CRESET
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP8
+L tomu-fpga:Testpoint-tomu-fpga TP8
 U 1 1 5C0A39C6
 P 5250 5400
 F 0 "TP8" H 5400 5450 50  0000 C CNN
@@ -1336,7 +1336,7 @@ Wire Wire Line
 Text Label 5450 5600 0    50   ~ 0
 CDONE
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP9
+L tomu-fpga:Testpoint-tomu-fpga TP9
 U 1 1 5C0B4DBE
 P 5250 5550
 F 0 "TP9" H 5400 5600 50  0000 C CNN
@@ -1350,7 +1350,7 @@ $EndComp
 Wire Wire Line
 	5400 5600 5850 5600
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP1
+L tomu-fpga:Testpoint-tomu-fpga TP1
 U 1 1 5C0C6529
 P 5250 4350
 F 0 "TP1" H 5400 4400 50  0000 C CNN
@@ -1362,7 +1362,7 @@ F 4 "X" H 0   0   50  0001 C CNN "DNP"
 	-1   0    0    1   
 $EndComp
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP12
+L tomu-fpga:Testpoint-tomu-fpga TP12
 U 1 1 5C0C65AF
 P 5250 6000
 F 0 "TP12" H 5400 6050 50  0000 C CNN
@@ -1382,7 +1382,7 @@ USB_P
 Text Label 5450 5750 0    50   ~ 0
 USB_N
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP10
+L tomu-fpga:Testpoint-tomu-fpga TP10
 U 1 1 5C0EA6CF
 P 5250 5700
 F 0 "TP10" H 5400 5750 50  0000 C CNN
@@ -1394,7 +1394,7 @@ F 4 "X" H 0   0   50  0001 C CNN "DNP"
 	-1   0    0    1   
 $EndComp
 $Comp
-L tomu-fpga-rescue:Testpoint-tomu-fpga TP11
+L tomu-fpga:Testpoint-tomu-fpga TP11
 U 1 1 5C0EA757
 P 5250 5850
 F 0 "TP11" H 5400 5900 50  0000 C CNN
@@ -1447,7 +1447,7 @@ Wire Wire Line
 Wire Wire Line
 	3850 7250 3850 6900
 $Comp
-L tomu-fpga-rescue:ICE40UP5K-UWG30-tomu-fpga U5
+L tomu-fpga:ICE40UP5K-UWG30-tomu-fpga U5
 U 2 1 5C122971
 P 3250 6500
 F 0 "U5" H 2900 5950 50  0000 C CNN
@@ -1510,7 +1510,7 @@ Wire Notes Line
 Text Notes 6400 4100 0    50   ~ 0
 Test Pads
 $Comp
-L tomu-fpga-rescue:Touchpad-Note-tomu-fpga XX1
+L tomu-fpga:Touchpad-Note-tomu-fpga XX1
 U 1 1 5C0024CC
 P 5900 3500
 F 0 "XX1" H 5978 3696 50  0000 L CNN
@@ -1528,7 +1528,7 @@ F 10 "X" H 0   0   50  0001 C CNN "DNP"
 	1    0    0    -1  
 $EndComp
 $Comp
-L tomu-fpga-rescue:Case-tomu-fpga XX2
+L tomu-fpga:Case-tomu-fpga XX2
 U 1 1 5C011D36
 P 5900 3750
 F 0 "XX2" H 6028 3896 50  0000 L CNN
@@ -1556,7 +1556,7 @@ Wire Notes Line
 Text Notes 4150 3750 0    50   ~ 0
 Manufacturing Notes
 $Comp
-L tomu-fpga-rescue:Case-tomu-fpga XX3
+L tomu-fpga:Case-tomu-fpga XX3
 U 1 1 5C0476E4
 P 5250 3450
 F 0 "XX3" H 5378 3596 50  0000 L CNN