diff --git a/hardware/LNA915/LNA915-cache.lib b/hardware/LNA915/LNA915-cache.lib
index 2d56e7ad..86fe49cc 100644
--- a/hardware/LNA915/LNA915-cache.lib
+++ b/hardware/LNA915/LNA915-cache.lib
@@ -105,43 +105,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LNA915_GRF6011
-#
-DEF LNA915_GRF6011 U 0 40 Y Y 1 F N
-F0 "U" 0 -100 50 H V C CNN
-F1 "LNA915_GRF6011" 0 -200 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -300 200 300 -250 0 1 0 N
-X VSEL 1 -400 100 100 R 50 50 1 1 I
-X VDD 2 -400 0 100 R 50 50 1 1 W
-X RFC 3 -400 -100 100 R 50 50 1 1 B
-X RF1 4 400 -100 100 L 50 50 1 1 B
-X GND 5 400 0 100 L 50 50 1 1 W
-X RF2 6 400 100 100 L 50 50 1 1 B
-X GND 7 0 300 100 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# LNA915_SMA-KIT-1.5MF
-#
-DEF LNA915_SMA-KIT-1.5MF P 0 40 Y N 2 F N
-F0 "P" 0 130 50 H V C CNN
-F1 "LNA915_SMA-KIT-1.5MF" 120 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-A -2 0 71 1636 0 0 1 10 N -70 20 70 0
-A -1 0 71 0 -1638 0 1 10 N 70 0 -70 -20
-C 0 0 20 0 1 8 N
-X RF 1 -200 0 180 R 50 50 1 1 P
-X SHIELD 2 0 -200 130 U 50 50 1 1 P
-X RF 3 -200 0 180 R 50 50 2 1 P
-X SHIELD 4 0 -200 130 U 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
 # gsg-symbols_BGB741L7ESD
 #
 DEF gsg-symbols_BGB741L7ESD U 0 40 Y Y 1 F N
@@ -178,6 +141,43 @@ X GND 5 -100 550 300 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# gsg-symbols_GRF6011
+#
+DEF gsg-symbols_GRF6011 U 0 40 Y Y 1 F N
+F0 "U" 0 -100 50 H V C CNN
+F1 "gsg-symbols_GRF6011" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -300 200 300 -250 0 1 0 N
+X VSEL 1 -400 100 100 R 50 50 1 1 I
+X VDD 2 -400 0 100 R 50 50 1 1 W
+X RFC 3 -400 -100 100 R 50 50 1 1 B
+X RF1 4 400 -100 100 L 50 50 1 1 B
+X GND 5 400 0 100 L 50 50 1 1 W
+X RF2 6 400 100 100 L 50 50 1 1 B
+X GND 7 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# gsg-symbols_SMA-KIT-1.5MF
+#
+DEF gsg-symbols_SMA-KIT-1.5MF P 0 40 Y N 2 F N
+F0 "P" 0 130 50 H V C CNN
+F1 "gsg-symbols_SMA-KIT-1.5MF" 120 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+A -2 0 71 1636 0 0 1 10 N -70 20 70 0
+A -1 0 71 0 -1638 0 1 10 N 70 0 -70 -20
+C 0 0 20 0 1 8 N
+X RF 1 -200 0 180 R 50 50 1 1 P
+X SHIELD 2 0 -200 130 U 50 50 1 1 P
+X RF 3 -200 0 180 R 50 50 2 1 P
+X SHIELD 4 0 -200 130 U 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
 # power_GND
 #
 DEF power_GND #PWR 0 0 Y Y 1 F P
diff --git a/hardware/LNA915/LNA915.kicad_pcb b/hardware/LNA915/LNA915.kicad_pcb
index 84a38718..08b4b661 100644
--- a/hardware/LNA915/LNA915.kicad_pcb
+++ b/hardware/LNA915/LNA915.kicad_pcb
@@ -165,7 +165,7 @@
       (net 1 GND))
   )
 
-  (module LNA915:SMA-KIT-1.5MF (layer F.Cu) (tedit 5F26EE20) (tstamp 5F278E99)
+  (module gsg-modules:SMA-KIT-1.5MF (layer F.Cu) (tedit 5F26EE20) (tstamp 5F278E99)
     (at 136.863 100 180)
     (path /5EF2AE41)
     (attr virtual)
@@ -224,7 +224,7 @@
       (net 1 GND))
   )
 
-  (module LNA915:GRF6011 (layer F.Cu) (tedit 5F279363) (tstamp 5F278692)
+  (module gsg-modules:GRF6011 (layer F.Cu) (tedit 5F279363) (tstamp 5F278692)
     (at 133.76 99.93 180)
     (path /5EF6E285)
     (attr smd)
@@ -276,7 +276,7 @@
       (net 2 VCC))
   )
 
-  (module LNA915:TSLP-7-1 (layer F.Cu) (tedit 5F26DB3A) (tstamp 5F2788A4)
+  (module gsg-modules:TSLP-7-1 (layer F.Cu) (tedit 5F26DB3A) (tstamp 5F2788A4)
     (at 131.47 99.61)
     (path /52F68792)
     (attr smd)
@@ -344,7 +344,7 @@
       (net 1 GND))
   )
 
-  (module LNA915:F5Q (layer F.Cu) (tedit 5F26F223) (tstamp 5F278651)
+  (module gsg-modules:F5Q (layer F.Cu) (tedit 5F26F223) (tstamp 5F278651)
     (at 127.2 102.2 270)
     (path /52F44412)
     (fp_text reference U4 (at 0 0 90) (layer F.SilkS)
@@ -380,7 +380,7 @@
       (net 1 GND))
   )
 
-  (module LNA915:GRF6011 (layer F.Cu) (tedit 5F279363) (tstamp 5F277FC8)
+  (module gsg-modules:GRF6011 (layer F.Cu) (tedit 5F279363) (tstamp 5F277FC8)
     (at 130.4 103.03)
     (path /5EF1EE32)
     (attr smd)
diff --git a/hardware/LNA915/LNA915.lib b/hardware/LNA915/LNA915.lib
index b543ee12..e933dbac 100644
--- a/hardware/LNA915/LNA915.lib
+++ b/hardware/LNA915/LNA915.lib
@@ -1,41 +1,4 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# GRF6011
-#
-DEF GRF6011 U 0 40 Y Y 1 F N
-F0 "U" 0 -100 50 H V C CNN
-F1 "GRF6011" 0 -200 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -300 200 300 -250 0 1 0 N
-X VSEL 1 -400 100 100 R 50 50 1 1 I
-X VDD 2 -400 0 100 R 50 50 1 1 W
-X RFC 3 -400 -100 100 R 50 50 1 1 B
-X RF1 4 400 -100 100 L 50 50 1 1 B
-X GND 5 400 0 100 L 50 50 1 1 W
-X RF2 6 400 100 100 L 50 50 1 1 B
-X GND 7 0 300 100 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# SMA-KIT-1.5MF
-#
-DEF SMA-KIT-1.5MF P 0 40 Y N 2 F N
-F0 "P" 0 130 50 H V C CNN
-F1 "SMA-KIT-1.5MF" 120 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-A -2 0 71 1636 0 0 1 10 N -70 20 70 0
-A -1 0 71 0 -1638 0 1 10 N 70 0 -70 -20
-C 0 0 20 0 1 8 N
-X RF 1 -200 0 180 R 50 50 1 1 P
-X SHIELD 2 0 -200 130 U 50 50 1 1 P
-X RF 3 -200 0 180 R 50 50 2 1 P
-X SHIELD 4 0 -200 130 U 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
 #End Library
diff --git a/hardware/LNA915/LNA915.pretty/F5Q.kicad_mod b/hardware/LNA915/LNA915.pretty/F5Q.kicad_mod
deleted file mode 100644
index 656dbfd5..00000000
--- a/hardware/LNA915/LNA915.pretty/F5Q.kicad_mod
+++ /dev/null
@@ -1,32 +0,0 @@
-(module F5Q (layer F.Cu) (tedit 5F26F223)
-  (fp_text reference REF** (at 0 -1.25) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value F5Q (at 0 1.35) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -0.6 -0.6) (end -0.6 -0.25) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.6 0.6) (end -0.7508 0.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.6 -0.6) (end 0.6 0.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.6 -0.6) (end 0.6 -0.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.55 -0.45) (end 0.55 -0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.55 -0.45) (end 0.55 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.55 0.45) (end -0.55 0.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.55 0.45) (end -0.55 -0.45) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.5 0.3) (thickness 0.075)))
-  )
-  (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.7 0.7) (end -0.85 0.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.85 0.7) (end -0.85 -0.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.85 -0.7) (end 0.7 -0.7) (layer F.CrtYd) (width 0.05))
-  (pad 5 smd rect (at 0 -0.325) (size 0.25 0.4) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 0 0.325) (size 0.25 0.4) (layers F.Cu F.Paste F.Mask)
-    (die_length 3.40614))
-  (pad 4 smd rect (at 0.395 -0.325) (size 0.25 0.4) (layers F.Cu F.Paste F.Mask)
-    (die_length -1518.485687))
-  (pad 3 smd rect (at 0.395 0.325) (size 0.25 0.4) (layers F.Cu F.Paste F.Mask)
-    (die_length -1518.485687))
-  (pad 1 smd rect (at -0.495 0) (size 0.4 0.25) (layers F.Cu F.Paste F.Mask)
-    (die_length 3.40614))
-)
diff --git a/hardware/LNA915/LNA915.pretty/GRF6011.kicad_mod b/hardware/LNA915/LNA915.pretty/GRF6011.kicad_mod
deleted file mode 100644
index 0aa1b17f..00000000
--- a/hardware/LNA915/LNA915.pretty/GRF6011.kicad_mod
+++ /dev/null
@@ -1,36 +0,0 @@
-(module GRF6011 (layer F.Cu) (tedit 5F279363)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.5) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value GRF6011 (at 0 1.6) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1.1 0.9) (end -1.1 -0.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.1 0.9) (end -1.1 0.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.1 -0.9) (end 1.1 0.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.1 -0.9) (end 1.1 -0.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.75 -0.75) (end 0.75 0.75) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.75 0.75) (end -0.75 0.75) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.75 0.85) (end -0.75 0.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.75 -0.85) (end -1.05 -0.85) (layer F.SilkS) (width 0.12))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.5 0.3) (thickness 0.075)))
-  )
-  (fp_line (start -0.75 -0.35) (end -0.35 -0.75) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.35 -0.75) (end 0.75 -0.75) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.75 -0.35) (end -0.75 0.75) (layer F.Fab) (width 0.1))
-  (pad 1 smd rect (at -0.75 -0.5) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at -0.75 0) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 3 smd rect (at -0.75 0.5) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd rect (at 0.75 0.5) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 5 smd rect (at 0.75 0) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 6 smd rect (at 0.75 -0.5) (size 0.4 0.2) (layers F.Cu F.Paste F.Mask))
-  (pad 7 smd rect (at 0 0) (size 0.6 1.1) (layers F.Cu F.Mask))
-  (pad 7 thru_hole circle (at 0 -0.25) (size 0.508 0.508) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at 0 0.25) (size 0.508 0.508) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 smd rect (at 0 0) (size 0.6 1.1) (layers B.Cu))
-  (pad 7 smd rect (at 0 -0.45) (size 0.6 0.2) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0 0.45) (size 0.6 0.2) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0 0) (size 0.6 0.3) (layers F.Cu F.Paste))
-)
diff --git a/hardware/LNA915/LNA915.pretty/SMA-KIT-1.5MF.kicad_mod b/hardware/LNA915/LNA915.pretty/SMA-KIT-1.5MF.kicad_mod
deleted file mode 100644
index 95073c31..00000000
--- a/hardware/LNA915/LNA915.pretty/SMA-KIT-1.5MF.kicad_mod
+++ /dev/null
@@ -1,34 +0,0 @@
-(module SMA-KIT-1.5MF (layer F.Cu) (tedit 5F26EE20)
-  (attr virtual)
-  (fp_text reference REF** (at 0 -5.2) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value SMA-KIT-1.5MF (at 0 5.2) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text user %R (at 1 -1.3) (layer F.Fab)
-    (effects (font (size 0.5 0.5) (thickness 0.075)))
-  )
-  (pad 2 smd rect (at 0.5 3.185) (size 1 2.6) (layers F.Cu F.Mask))
-  (pad 2 smd rect (at 0.5 -3.185) (size 1 2.6) (layers B.Cu B.Mask))
-  (pad 2 smd rect (at 0.5 3.185) (size 1 2.6) (layers B.Cu B.Mask))
-  (pad 2 smd rect (at 0.5 -3.185) (size 1 2.6) (layers F.Cu F.Mask))
-  (pad 1 smd rect (at 0.75 0) (size 1.5 1.6) (layers F.Cu F.Mask))
-  (pad 2 thru_hole circle (at 0.6 -2.3) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0.6 -3) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0.6 -3.7) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0.6 2.3) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0.6 3) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0.6 3.7) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 11.39 -3.7 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 smd rect (at 11.49 -3.185 180) (size 1 2.6) (layers B.Cu B.Mask))
-  (pad 3 smd rect (at 11.24 0 180) (size 1.5 1.6) (layers F.Cu F.Mask))
-  (pad 4 smd rect (at 11.49 3.185 180) (size 1 2.6) (layers F.Cu F.Mask))
-  (pad 4 thru_hole circle (at 11.39 3 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 11.39 -2.3 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 11.39 2.3 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 11.39 -3 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 smd rect (at 11.49 -3.185 180) (size 1 2.6) (layers F.Cu F.Mask))
-  (pad 4 thru_hole circle (at 11.39 3.7 180) (size 0.64 0.64) (drill 0.3) (layers *.Cu *.Mask))
-  (pad 4 smd rect (at 11.49 3.185 180) (size 1 2.6) (layers B.Cu B.Mask))
-)
diff --git a/hardware/LNA915/LNA915.pretty/TSLP-7-1.kicad_mod b/hardware/LNA915/LNA915.pretty/TSLP-7-1.kicad_mod
deleted file mode 100644
index d29bc463..00000000
--- a/hardware/LNA915/LNA915.pretty/TSLP-7-1.kicad_mod
+++ /dev/null
@@ -1,45 +0,0 @@
-(module TSLP-7-1 (layer F.Cu) (tedit 5F26DB3A)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value TSLP-7-1 (at 0 2) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -0.75 -1) (end -0.75 1.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.75 -1) (end 0.75 1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.65 -1) (end 0.65 -1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.65 -1) (end 0.65 1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.65 1) (end -0.35 1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.65 0.7) (end -0.65 -1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.8 -1.25) (end 0.8 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.8 -1.25) (end 0.8 1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.8 1.25) (end -0.8 1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.8 1.25) (end -0.8 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.35 1) (end -0.65 0.7) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at 0 0 90) (layer F.Fab)
-    (effects (font (size 0.5 0.5) (thickness 0.075)))
-  )
-  (pad 7 smd rect (at 0 0) (size 1.2 1.1) (layers B.Cu))
-  (pad 1 smd rect (at -0.5 0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask)
-    (die_length 3.40614))
-  (pad 2 smd rect (at 0 0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask))
-  (pad 3 smd rect (at 0.5 0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd rect (at 0.5 -0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask))
-  (pad 5 smd rect (at 0 -0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask))
-  (pad 6 smd rect (at -0.5 -0.925) (size 0.3 0.35) (layers F.Cu F.Paste F.Mask))
-  (pad 7 smd rect (at 0 0) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0 0) (size 1.2 1.1) (layers F.Cu F.Mask))
-  (pad 7 thru_hole circle (at 0.3 -0.275) (size 0.5 0.5) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at 0.3 0.275) (size 0.5 0.5) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at -0.3 0.275) (size 0.5 0.5) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at -0.3 -0.275) (size 0.5 0.5) (drill 0.254) (layers *.Cu *.Mask))
-  (pad 7 smd rect (at 0.45 0) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0.45 -0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0 -0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at -0.45 -0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at -0.45 0) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at -0.45 0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0 0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-  (pad 7 smd rect (at 0.45 0.4) (size 0.3 0.3) (layers F.Cu F.Paste))
-)
diff --git a/hardware/LNA915/LNA915.sch b/hardware/LNA915/LNA915.sch
index 87e783e3..02ba671c 100644
--- a/hardware/LNA915/LNA915.sch
+++ b/hardware/LNA915/LNA915.sch
@@ -110,7 +110,7 @@ U 1 1 52F44412
 P 2900 3900
 F 0 "U4" V 2900 3900 60  0000 C CNN
 F 1 "SAW" V 3150 3900 60  0000 C CNN
-F 2 "LNA915:F5Q" H 2900 3900 60  0001 C CNN
+F 2 "gsg-modules:F5Q" H 2900 3900 60  0001 C CNN
 F 3 "~" H 2900 3900 60  0000 C CNN
 F 4 "Taiyo Yuden" H 2900 3900 60  0001 C CNN "Manufacturer"
 F 5 "FAR-F5QA-915M00-M2AK-J" H 2900 3900 60  0001 C CNN "Part Number"
@@ -178,7 +178,7 @@ U 1 1 52F68792
 P 6250 3150
 F 0 "U3" V 6250 3050 60  0000 C CNN
 F 1 "LNA" H 6250 2900 60  0000 C CNN
-F 2 "LNA915:TSLP-7-1" H 6250 3150 60  0001 C CNN
+F 2 "gsg-modules:TSLP-7-1" H 6250 3150 60  0001 C CNN
 F 3 "~" H 6250 3150 60  0000 C CNN
 F 4 "Infineon" H 6250 3150 60  0001 C CNN "Manufacturer"
 F 5 "BGB 741L7ESD E6327" H 6250 3150 60  0001 C CNN "Part Number"
@@ -525,12 +525,12 @@ F 6 "CAP CER 100PF 50V 5% NP0 0402" H 9250 3250 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LNA915:GRF6011 U1
+L gsg-symbols:GRF6011 U1
 U 1 1 5EF1EE32
 P 4000 3150
 F 0 "U1" H 4000 2827 50  0000 C CNN
 F 1 "SWITCH" H 4000 2736 50  0000 C CNN
-F 2 "LNA915:GRF6011" H 4000 3150 50  0001 C CNN
+F 2 "gsg-modules:GRF6011" H 4000 3150 50  0001 C CNN
 F 3 "" H 4000 3150 50  0001 C CNN
 F 4 "SPDT Failsafe Switch 0.1 –6.0 GHz " H 4000 3150 50  0001 C CNN "Description"
 F 5 "Guerrilla RF" H 4000 3150 50  0001 C CNN "Manufacturer"
@@ -541,12 +541,12 @@ $EndComp
 Wire Wire Line
 	4400 3250 4600 3250
 $Comp
-L LNA915:GRF6011 U2
+L gsg-symbols:GRF6011 U2
 U 1 1 5EF6E285
 P 8200 3350
 F 0 "U2" H 8200 2935 50  0000 C CNN
 F 1 "SWITCH" H 8200 3026 50  0000 C CNN
-F 2 "LNA915:GRF6011" H 8200 3350 50  0001 C CNN
+F 2 "gsg-modules:GRF6011" H 8200 3350 50  0001 C CNN
 F 3 "" H 8200 3350 50  0001 C CNN
 F 4 "SPDT Failsafe Switch 0.1 –6.0 GHz " H 8200 3350 50  0001 C CNN "Description"
 F 5 "Guerrilla RF" H 8200 3350 50  0001 C CNN "Manufacturer"
@@ -793,12 +793,12 @@ Wire Wire Line
 Text Notes 1150 5250 0    60   ~ 0
 L2 unpopulated: DC is blocked on port P1B. Board is powered by P1A.\n\nL2 populated: DC is passed through. Board can be powered by P1A or P1B.
 $Comp
-L LNA915:SMA-KIT-1.5MF P1
+L gsg-symbols:SMA-KIT-1.5MF P1
 U 1 1 5EF2AE41
 P 10050 3250
 F 0 "P1" H 10150 3225 50  0000 L CNN
 F 1 "SMA-KIT-1.5MF" H 10150 3134 50  0000 L CNN
-F 2 "LNA915:SMA-KIT-1.5MF" H 10050 3250 50  0001 C CNN
+F 2 "gsg-modules:SMA-KIT-1.5MF" H 10050 3250 50  0001 C CNN
 F 3 "" H 10050 3250 50  0001 C CNN
 F 4 "HOUSING BRASS 0.43\"DIA X 1.5\"L" H 10050 3250 50  0001 C CNN "Description"
 F 5 "Crystek" H 10050 3250 50  0001 C CNN "Manufacturer"
@@ -807,12 +807,12 @@ F 6 "SMA-KIT-1.5MF" H 10050 3250 50  0001 C CNN "Part Number"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LNA915:SMA-KIT-1.5MF P1
+L gsg-symbols:SMA-KIT-1.5MF P1
 U 2 1 5EF2B48D
 P 1300 3900
 F 0 "P1" H 1700 4000 50  0000 C CNN
 F 1 "SMA-KIT-1.5MF" H 1700 3900 50  0000 C CNN
-F 2 "LNA915:SMA-KIT-1.5MF" H 1300 3900 50  0001 C CNN
+F 2 "gsg-modules:SMA-KIT-1.5MF" H 1300 3900 50  0001 C CNN
 F 3 "" H 1300 3900 50  0001 C CNN
 F 4 "HOUSING BRASS 0.43\"DIA X 1.5\"L" H 1300 3900 50  0001 C CNN "Description"
 F 5 "Crystek" H 1300 3900 50  0001 C CNN "Manufacturer"
diff --git a/hardware/gsg-kicad-lib b/hardware/gsg-kicad-lib
index 88b75845..c7dc43f6 160000
--- a/hardware/gsg-kicad-lib
+++ b/hardware/gsg-kicad-lib
@@ -1 +1 @@
-Subproject commit 88b758457c20153ece911d930f8690f70a120dcf
+Subproject commit c7dc43f67557e9060f74169ac68d9cc933268b23