diff --git a/lbr/SeniorDesign.lbr b/lbr/SeniorDesign.lbr
--- a/lbr/SeniorDesign.lbr
+++ b/lbr/SeniorDesign.lbr
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -217,6 +217,8 @@
 <circle x="0" y="0" radius="2.4" width="0.127" layer="21"/>
 <smd name="V+" x="3.8" y="0.75" dx="2" dy="0.5" layer="1"/>
 <smd name="V-" x="3.8" y="-0.75" dx="2" dy="0.5" layer="1"/>
+<text x="-2.54" y="2.54" size="1.016" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-3.81" size="1.016" layer="27">&gt;VALUE</text>
 </package>
 <package name="KUSBLX-SMT-AS1N-B">
 <smd name="P$1" x="-3.5" y="8" dx="0.9" dy="2.5" layer="1" rot="R180"/>
@@ -60322,6 +60324,8 @@ consumption.</description>
 <pin name="V-" x="-10.16" y="0" visible="pad"/>
 <wire x1="-1.778" y1="0" x2="-1.778" y2="-1.27" width="0.508" layer="94"/>
 <wire x1="-2.54" y1="0" x2="-1.778" y2="0" width="0.127" layer="94"/>
+<text x="-2.54" y="5.08" size="1.016" layer="95">&gt;NAME</text>
+<text x="-2.54" y="-5.08" size="1.016" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="KUSBLX-SMT-AS1N-B">
 <wire x1="0" y1="0" x2="12.7" y2="0" width="0.254" layer="94"/>
diff --git a/master/eagle.epf b/master/eagle.epf
--- a/master/eagle.epf
+++ b/master/eagle.epf
@@ -342,51 +342,12 @@ UsedLibrary="C:/Program Files (x86)/EAGL
 UsedLibrary="C:/Users/ethanzonca/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
 
 [Win_1]
-Type="Board Editor"
-Loc="332 293 931 692"
-State=2
-Number=1
-File="master.brd"
-View="-13.0726 -4.59283 61.7771 58.5678"
-WireWidths=" 0 0.254 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
-ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
-WireBendSet=0
-WireCap=1
-MiterStyle=0
-PadShape=0
-ViaShape=0
-PolygonPour=0
-PolygonRank=1
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=16
-
-[Win_2]
 Type="Schematic Editor"
 Loc="332 293 931 692"
-State=2
+State=3
 Number=2
 File="master.sch"
-View="152.549 106.37 337.668 215.679"
+View="74.8924 169.865 164.167 222.58"
 WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
@@ -418,12 +379,12 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: 152.549 106.37 337.668 215.679"
+Views=" 1: 74.8924 169.865 164.167 222.58"
 Sheet=1
 
-[Win_3]
+[Win_2]
 Type="Control Panel"
-Loc="230 163 1112 820"
+Loc="332 293 931 692"
 State=2
 Number=0
 
@@ -431,4 +392,3 @@ Number=0
 Screen="1280 1024"
 Window="Win_1"
 Window="Win_2"
-Window="Win_3"
diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -220,6 +220,8 @@
 <wire x1="16.51" y1="10.795" x2="16.51" y2="9.525" width="0.127" layer="25"/>
 <wire x1="16.51" y1="9.525" x2="13.97" y2="9.525" width="0.127" layer="25"/>
 <wire x1="13.97" y1="9.525" x2="13.97" y2="10.795" width="0.127" layer="25"/>
+<circle x="6.35" y="8.89" radius="2.272953125" width="0.127" layer="51"/>
+<text x="5.715" y="8.5725" size="0.8128" layer="25">B1</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -949,6 +951,8 @@ www.irf.com&lt;p&gt;
 <circle x="0" y="0" radius="2.4" width="0.127" layer="21"/>
 <smd name="V+" x="3.8" y="0.75" dx="2" dy="0.5" layer="1"/>
 <smd name="V-" x="3.8" y="-0.75" dx="2" dy="0.5" layer="1"/>
+<text x="-2.54" y="2.54" size="1.016" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-3.81" size="1.016" layer="27">&gt;VALUE</text>
 </package>
 <package name="BALLOON">
 <rectangle x1="15.3035" y1="0.0127" x2="15.3543" y2="0.0381" layer="21"/>
@@ -26660,7 +26664,7 @@ Please make sure your boards conform to 
 <attribute name="MPN" value="ATMEGA644PV-10AU" x="82.55" y="59.69" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MF" value="" x="82.55" y="59.69" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="OC_FARNELL" value="1455123" x="82.55" y="59.69" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="NAME" x="36.195" y="16.1925" size="0.8128" layer="25"/>
+<attribute name="NAME" x="36.03625" y="16.1925" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="45.5851" y="12.065" size="1.778" layer="27" rot="R90"/>
 </element>
 <element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="41.91" y="6.985" smashed="yes" rot="R180">
@@ -26672,11 +26676,11 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="16.256" y="8.4455" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="C8" library="SparkFun" package="0603-CAP" value="8.2pF" x="13.335" y="29.68625" smashed="yes">
-<attribute name="NAME" x="12.92225" y="30.44825" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="12.7635" y="30.44825" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="12.319" y="28.54325" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="C9" library="SparkFun" package="0603-CAP" value="1uF" x="13.335" y="28.2575" smashed="yes">
-<attribute name="NAME" x="12.92225" y="26.797" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="12.7635" y="26.797" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="12.319" y="27.1145" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="C13" library="SparkFun" package="0603-CAP" value=".1uF" x="38.1" y="49.2125" smashed="yes" rot="R180">
@@ -26688,7 +26692,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="41.656" y="26.543" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="34.925" y="6.50875" smashed="yes">
-<attribute name="NAME" x="34.19475" y="7.27075" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="33.87725" y="7.27075" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="33.909" y="5.36575" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="C17" library="SparkFun" package="0603-CAP" value="10uF" x="27.94" y="17.62125" smashed="yes" rot="R270">
@@ -26721,15 +26725,15 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="12.7" y="4.1275" size="1.27" layer="27" rot="R180"/>
 </element>
 <element name="POWER" library="adafruit" package="CHIPLED_0603" value="WHITE" x="22.86" y="2.2225" smashed="yes" rot="R90">
-<attribute name="NAME" x="25.7175" y="1.42875" size="0.8128" layer="25" rot="R180"/>
+<attribute name="NAME" x="25.7175" y="1.5875" size="0.8128" layer="25" rot="R180"/>
 <attribute name="VALUE" x="24.13" y="4.1275" size="1.27" layer="27" rot="R180"/>
 </element>
 <element name="R10" library="SparkFun" package="0603-RES" value="4.7k" x="49.05375" y="16.51" smashed="yes" rot="R180">
-<attribute name="NAME" x="50.1015" y="15.748" size="0.8128" layer="25" font="vector" rot="R180"/>
+<attribute name="NAME" x="50.26025" y="15.748" size="0.8128" layer="25" font="vector" rot="R180"/>
 <attribute name="VALUE" x="50.06975" y="17.653" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="R11" library="SparkFun" package="0603-RES" value="4.7k" x="49.05375" y="21.59" smashed="yes">
-<attribute name="NAME" x="48.3235" y="22.352" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="48.16475" y="22.352" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="48.03775" y="20.447" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="Q5" library="transistor-npn" package="SOT23-BEC" value="NPN" x="30.48" y="44.45" smashed="yes">
@@ -26761,7 +26765,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="28.2046" y="53.5659" size="1.27" layer="27"/>
 </element>
 <element name="R22" library="SparkFun" package="0603-RES" value="10k" x="26.67" y="44.45" smashed="yes">
-<attribute name="NAME" x="25.781" y="45.212" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="25.62225" y="45.212" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="25.654" y="43.307" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="Q6" library="transistor-small-signal" package="SOT23" value="BSH202" x="22.86" y="44.45" smashed="yes">
@@ -26772,8 +26776,8 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="48.73625" y="20.47875" size="0.8128" layer="25" rot="R270"/>
 <attribute name="VALUE" x="45.24375" y="21.59" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="5V_SWITCHING" library="SeniorDesign" package="SOIC8HEAT" value="IFX91041EJ V50" x="44.45" y="34.29" smashed="yes" rot="R90">
-<attribute name="NAME" x="40.48125" y="36.83" size="0.8128" layer="25"/>
+<element name="5V_SW" library="SeniorDesign" package="SOIC8HEAT" value="IFX91041EJ V50" x="44.45" y="34.29" smashed="yes" rot="R90">
+<attribute name="NAME" x="44.60875" y="32.86125" size="0.6096" layer="25" rot="R90"/>
 <attribute name="VALUE" x="46.355" y="38.735" size="1.27" layer="27" rot="R180"/>
 </element>
 <element name="C12" library="SparkFun" package="0805" value="10uF" x="44.45" y="30.48" smashed="yes">
@@ -26808,12 +26812,12 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="47.6885" y="35.52825" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="49.784" y="34.7345" size="0.4064" layer="27" font="vector"/>
 </element>
-<element name="3.3V_LDO_REG" library="SeniorDesign" package="SOIC8" value="TPS76833QD" x="26.9875" y="35.8775" smashed="yes" rot="R270">
-<attribute name="NAME" x="23.97125" y="38.4175" size="0.8128" layer="25"/>
+<element name="3.3V_LDO" library="SeniorDesign" package="SOIC8" value="TPS76833QD" x="26.9875" y="35.8775" smashed="yes" rot="R270">
+<attribute name="NAME" x="27.46375" y="33.81375" size="0.6096" layer="25" rot="R90"/>
 <attribute name="VALUE" x="25.0825" y="31.4325" size="1.27" layer="27"/>
 </element>
 <element name="C21" library="SparkFun" package="0603-CAP" value="0.1uF" x="20.79625" y="37.465" smashed="yes" rot="R90">
-<attribute name="NAME" x="18.63725" y="37.11575" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="18.00225" y="37.11575" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="21.93925" y="36.449" size="0.4064" layer="27" font="vector" rot="R90"/>
 </element>
 <element name="C20" library="SparkFun" package="0603-CAP" value="10uF" x="26.9875" y="39.6875" smashed="yes" rot="R180">
@@ -26825,18 +26829,18 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="0.635" y="12.7" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R23" library="SparkFun" package="0603-RES" value="10R" x="7.3025" y="26.67" smashed="yes">
-<attribute name="NAME" x="6.57225" y="25.2095" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="6.25475" y="25.2095" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="6.2865" y="25.527" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="L5" library="SparkFun" package="C0402" value="27nH" x="7.46125" y="28.2575" smashed="yes">
-<attribute name="NAME" x="7.0485" y="28.79725" size="0.8128" layer="25"/>
+<attribute name="NAME" x="6.88975" y="28.79725" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="6.38175" y="27.1145" size="0.4064" layer="27"/>
 </element>
 <element name="U7" library="SeniorDesign" package="SOT23-5" value="24AA32AFT" x="10.795" y="9.525" smashed="yes" rot="R180">
 <attribute name="NAME" x="11.7475" y="9.8425" size="0.8128" layer="25" rot="R180"/>
 <attribute name="VALUE" x="13.335" y="13.335" size="1.27" layer="27" rot="R180"/>
 </element>
-<element name="U$7" library="SeniorDesign" package="MS412FE-FL26E" value="MS412FE-FL26E" x="6.35" y="8.89" smashed="yes" rot="R180"/>
+<element name="B1" library="SeniorDesign" package="MS412FE-FL26E" value="MS412FE-FL26E" x="6.35" y="8.89" smashed="yes" rot="R180"/>
 <element name="D2" library="SparkFun" package="SOD-323" value="SCHOTTKEY" x="15.24" y="10.16" smashed="yes">
 <attribute name="NAME" x="14.6685" y="11.01725" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="14.224" y="8.763" size="0.4064" layer="27"/>
@@ -26846,7 +26850,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="17.907" y="9.906" size="0.4064" layer="27" font="vector" rot="R270"/>
 </element>
 <element name="AUX0" library="adafruit" package="CHIPLED_0603" value="WHITE" x="26.67" y="27.305" smashed="yes" rot="R45">
-<attribute name="NAME" x="28.3890125" y="27.227959375" size="0.8128" layer="25" rot="R135"/>
+<attribute name="NAME" x="28.8652625" y="27.069209375" size="0.8128" layer="25" rot="R135"/>
 <attribute name="VALUE" x="28.9150625" y="27.7540125" size="1.27" layer="27" rot="R135"/>
 </element>
 <element name="R13" library="SparkFun" package="0603-RES" value="2.2R" x="29.845" y="28.2575" smashed="yes" rot="R180">
@@ -26854,11 +26858,11 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="30.861" y="29.4005" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="AUX1" library="adafruit" package="CHIPLED_0603" value="WHITE" x="27.94" y="24.765" smashed="yes" rot="R135">
-<attribute name="NAME" x="29.2870375" y="25.2140125" size="0.8128" layer="25" rot="R225"/>
+<attribute name="NAME" x="29.6045375" y="25.5315125" size="0.8128" layer="25" rot="R225"/>
 <attribute name="VALUE" x="27.490984375" y="27.0100625" size="1.27" layer="27" rot="R225"/>
 </element>
 <element name="R14" library="SparkFun" package="0603-RES" value="2.2R" x="29.845" y="22.5425" smashed="yes" rot="R180">
-<attribute name="NAME" x="30.734" y="21.7805" size="0.8128" layer="25" font="vector" rot="R180"/>
+<attribute name="NAME" x="31.0515" y="21.7805" size="0.8128" layer="25" font="vector" rot="R180"/>
 <attribute name="VALUE" x="30.861" y="23.6855" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="AUX2" library="adafruit" package="CHIPLED_0603" value="WHITE" x="25.4" y="23.495" smashed="yes" rot="R225">
@@ -26878,7 +26882,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="21.209" y="27.1145" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="SETGPS" library="SLAT-CON-JST-ZH" package="ZH-V-3-1" value="ZH-V-3-1" x="51.91125" y="12.7" smashed="yes" rot="R270">
-<attribute name="NAME" x="49.82845" y="13.0592" size="0.8128" layer="25" rot="R270"/>
+<attribute name="NAME" x="49.6697" y="13.53545" size="0.8128" layer="25" rot="R270"/>
 <attribute name="VALUE" x="47.99965" y="14.4054" size="1.27" layer="27" rot="R270"/>
 </element>
 <element name="IC3" library="74xx-little-us" package="SOT23-5" value="ON M74VHC1GT125DT1G" x="38.1" y="45.72" smashed="yes">
@@ -26886,15 +26890,15 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="35.56" y="41.91" size="1.27" layer="27"/>
 </element>
 <element name="R27" library="SparkFun" package="R2512" value="47R" x="14.2875" y="35.56" smashed="yes" rot="R180">
-<attribute name="NAME" x="15.24" y="35.8775" size="0.8128" layer="25" rot="R180"/>
+<attribute name="NAME" x="15.5575" y="35.8775" size="0.8128" layer="25" rot="R180"/>
 <attribute name="VALUE" x="16.8275" y="38.735" size="1.27" layer="27" rot="R180"/>
 </element>
 <element name="Q7" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="18.0975" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="17.5895" y="39.08425" size="0.8128" layer="25"/>
+<attribute name="NAME" x="17.43075" y="38.9255" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="19.1135" y="39.5605" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="Q9" library="transistor-npn" package="SOT23-BEC" value="NPN" x="13.0175" y="39.37" smashed="yes" rot="R180">
-<attribute name="NAME" x="13.6525" y="39.6875" size="0.8128" layer="25" rot="R180"/>
+<attribute name="NAME" x="12.3825" y="38.89375" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="14.9225" y="42.545" size="1.27" layer="27" rot="R180"/>
 </element>
 <element name="R29" library="SparkFun" package="0603-RES" value="1M" x="15.5575" y="39.37" smashed="yes" rot="R90">
@@ -26918,7 +26922,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="16.3195" y="9.87425" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C4" library="SparkFun" package="0603-CAP" value=".1uF" x="46.355" y="16.1925" smashed="yes" rot="R90">
-<attribute name="NAME" x="45.7835" y="17.272" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="45.7835" y="14.25575" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="47.498" y="15.1765" size="0.4064" layer="27" font="vector" rot="R90"/>
 </element>
 <element name="MICROSD" library="adafruit" package="MICROSD" value="MICROSD" x="16.1925" y="6.985" smashed="yes" rot="MR90">
@@ -26954,8 +26958,8 @@ Please make sure your boards conform to 
 <attribute name="OC_FARNELL" value="1019328" x="0" y="32.385" size="1.778" layer="27" display="off"/>
 <attribute name="VALUE" x="1.27" y="23.495" size="1.778" layer="27"/>
 </element>
-<element name="U$3" library="Protofusion" package="0603-ARV-4" value="4.7k" x="26.035" y="7.62" smashed="yes" rot="R90">
-<attribute name="NAME" x="24.92375" y="4.98475" size="0.8128" layer="25" ratio="10"/>
+<element name="RA1" library="Protofusion" package="0603-ARV-4" value="4.7k" x="26.035" y="7.62" smashed="yes" rot="R90">
+<attribute name="NAME" x="25.0825" y="4.98475" size="0.8128" layer="25" ratio="10"/>
 <attribute name="VALUE" x="24.511" y="5.715" size="1.27" layer="27" ratio="10" rot="R90"/>
 </element>
 <element name="JTAG" library="SLAT-CON-JST-ZH" package="ZH-V-4-1" value="ZH-V-4-1" x="51.91125" y="28.575" smashed="yes" rot="R270">
@@ -26983,7 +26987,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="54.13375" y="18.57375" size="1.27" layer="27" rot="R90"/>
 </element>
 <element name="R9" library="SparkFun" package="0603-RES" value="100R" x="52.22875" y="16.35125" smashed="yes" rot="R90">
-<attribute name="NAME" x="51.4985" y="17.43075" size="0.8128" layer="25" font="vector"/>
+<attribute name="NAME" x="51.65725" y="14.4145" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="53.37175" y="15.33525" size="0.4064" layer="27" font="vector" rot="R90"/>
 </element>
 <element name="U$4" library="SeniorDesign" package="BALLOON" value="" x="24.13" y="28.575" rot="MR180"/>
@@ -26992,7 +26996,7 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="19.65325" y="35.306" size="0.4064" layer="27" font="vector" rot="R270"/>
 </element>
 <element name="L4" library="SparkFun" package="0603" value="BLM18PG221SN1" x="30.48" y="32.385" smashed="yes" rot="R180">
-<attribute name="NAME" x="31.21025" y="31.623" size="0.8128" layer="25" font="vector" rot="R180"/>
+<attribute name="NAME" x="31.369" y="31.623" size="0.8128" layer="25" font="vector" rot="R180"/>
 <attribute name="VALUE" x="31.496" y="33.528" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="C5" library="SparkFun" package="1210" value="47uF" x="38.735" y="28.2575" smashed="yes" rot="R180">
@@ -27039,17 +27043,17 @@ Please make sure your boards conform to 
 <contactref element="M2" pad="0V"/>
 <contactref element="C13" pad="1"/>
 <contactref element="BATT" pad="2"/>
-<contactref element="5V_SWITCHING" pad="9"/>
-<contactref element="5V_SWITCHING" pad="2"/>
+<contactref element="5V_SW" pad="9"/>
+<contactref element="5V_SW" pad="2"/>
 <contactref element="Q6" pad="1"/>
 <contactref element="C12" pad="2"/>
-<contactref element="5V_SWITCHING" pad="1"/>
+<contactref element="5V_SW" pad="1"/>
 <contactref element="R2" pad="1"/>
 <contactref element="D1" pad="A"/>
 <contactref element="C19" pad="2"/>
 <contactref element="C18" pad="2"/>
-<contactref element="3.3V_LDO_REG" pad="1"/>
-<contactref element="3.3V_LDO_REG" pad="2"/>
+<contactref element="3.3V_LDO" pad="1"/>
+<contactref element="3.3V_LDO" pad="2"/>
 <contactref element="C21" pad="2"/>
 <contactref element="C20" pad="2"/>
 <contactref element="U3" pad="12"/>
@@ -27060,7 +27064,7 @@ Please make sure your boards conform to 
 <contactref element="U3" pad="10"/>
 <contactref element="U7" pad="2"/>
 <contactref element="U7" pad="5"/>
-<contactref element="U$7" pad="V-"/>
+<contactref element="B1" pad="V-"/>
 <contactref element="AUX0" pad="C"/>
 <contactref element="AUX1" pad="C"/>
 <contactref element="AUX2" pad="C"/>
@@ -27324,7 +27328,7 @@ Please make sure your boards conform to 
 <via x="28.2575" y="7.9375" extent="1-16" drill="0.254"/>
 <wire x1="28.2575" y1="7.9375" x2="31.115" y2="7.9375" width="0.4064" layer="16"/>
 <wire x1="31.115" y1="7.9375" x2="32.0675" y2="6.985" width="0.4064" layer="16"/>
-<contactref element="U$3" pad="6"/>
+<contactref element="RA1" pad="6"/>
 <wire x1="26.87955" y1="8.0137" x2="28.1813" y2="8.0137" width="0.4064" layer="1"/>
 <wire x1="28.1813" y1="8.0137" x2="28.2575" y2="7.9375" width="0.4064" layer="1"/>
 </signal>
@@ -27343,7 +27347,7 @@ Please make sure your boards conform to 
 <via x="29.05125" y="7.14375" extent="1-16" drill="0.254"/>
 <wire x1="29.05125" y1="7.14375" x2="30.00375" y2="7.14375" width="0.4064" layer="16"/>
 <wire x1="30.00375" y1="7.14375" x2="31.115" y2="6.0325" width="0.4064" layer="16"/>
-<contactref element="U$3" pad="7"/>
+<contactref element="RA1" pad="7"/>
 <wire x1="26.87955" y1="7.2263" x2="28.9687" y2="7.2263" width="0.4064" layer="1"/>
 <wire x1="28.9687" y1="7.2263" x2="29.05125" y2="7.14375" width="0.4064" layer="1"/>
 </signal>
@@ -27351,7 +27355,7 @@ Please make sure your boards conform to 
 <contactref element="IC1" pad="1"/>
 <contactref element="ICSP" pad="4"/>
 <wire x1="30.1625" y1="5.715" x2="31.75" y2="4.1275" width="0.4064" layer="1"/>
-<contactref element="U$3" pad="5"/>
+<contactref element="RA1" pad="5"/>
 <wire x1="31.75" y1="10.63625" x2="32.745" y2="10.63625" width="0.4064" layer="1"/>
 <wire x1="30.1625" y1="5.715" x2="30.1625" y2="8.8011" width="0.4064" layer="1"/>
 <wire x1="30.1625" y1="8.8011" x2="26.87955" y2="8.8011" width="0.4064" layer="1"/>
@@ -27679,7 +27683,7 @@ Please make sure your boards conform to 
 <signal name="5V">
 <contactref element="M2" pad="VCC"/>
 <contactref element="C13" pad="2"/>
-<contactref element="5V_SWITCHING" pad="4"/>
+<contactref element="5V_SW" pad="4"/>
 <contactref element="C18" pad="1"/>
 <contactref element="C19" pad="1"/>
 <contactref element="IC2" pad="5"/>
@@ -27842,9 +27846,9 @@ Please make sure your boards conform to 
 </signal>
 <signal name="VBAT">
 <contactref element="Q6" pad="2"/>
-<contactref element="5V_SWITCHING" pad="8"/>
+<contactref element="5V_SW" pad="8"/>
 <contactref element="C12" pad="1"/>
-<contactref element="5V_SWITCHING" pad="7"/>
+<contactref element="5V_SW" pad="7"/>
 <contactref element="BUZZ" pad="1"/>
 <contactref element="R29" pad="2"/>
 <contactref element="Q7" pad="2"/>
@@ -27888,7 +27892,7 @@ Please make sure your boards conform to 
 <contactref element="C5" pad="1"/>
 </signal>
 <signal name="N$4">
-<contactref element="5V_SWITCHING" pad="3"/>
+<contactref element="5V_SW" pad="3"/>
 <contactref element="C10" pad="1"/>
 <wire x1="49.95" y1="33.655" x2="49.95" y2="33.87" width="0.4064" layer="1"/>
 <wire x1="49.95" y1="33.87" x2="48.895" y2="34.925" width="0.4064" layer="1"/>
@@ -27900,12 +27904,12 @@ Please make sure your boards conform to 
 <wire x1="51.65" y1="33.655" x2="51.65" y2="31.115" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$19">
-<contactref element="5V_SWITCHING" pad="5"/>
+<contactref element="5V_SW" pad="5"/>
 <contactref element="C16" pad="1"/>
 <wire x1="41.85" y1="36.195" x2="39.585" y2="36.195" width="0.6096" layer="1"/>
 </signal>
 <signal name="N$21">
-<contactref element="5V_SWITCHING" pad="6"/>
+<contactref element="5V_SW" pad="6"/>
 <contactref element="C16" pad="2"/>
 <contactref element="D1" pad="C"/>
 <contactref element="L3" pad="1"/>
@@ -27979,7 +27983,7 @@ Please make sure your boards conform to 
 <wire x1="14.975" y1="11.045" x2="14.09" y2="10.16" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$32">
-<contactref element="U$7" pad="V+"/>
+<contactref element="B1" pad="V+"/>
 <contactref element="R3" pad="2"/>
 <wire x1="2.55" y1="8.14" x2="2.55" y2="7.61" width="0.4064" layer="1"/>
 <wire x1="19.05" y1="8.04" x2="19.05" y2="6.6675" width="0.4064" layer="1"/>
@@ -28146,7 +28150,7 @@ Please make sure your boards conform to 
 <wire x1="7.62" y1="12.065" x2="6.0325" y2="13.6525" width="0.4064" layer="16"/>
 <wire x1="6.0325" y1="13.6525" x2="5.685" y2="13.6525" width="0.4064" layer="16"/>
 <wire x1="5.685" y1="13.6525" x2="5.5525" y2="13.785" width="0.4064" layer="16"/>
-<contactref element="U$3" pad="4"/>
+<contactref element="RA1" pad="4"/>
 <wire x1="23.8125" y1="11.7475" x2="23.8125" y2="11.69125" width="0.4064" layer="1"/>
 <wire x1="23.8125" y1="11.69125" x2="25.185" y2="10.31875" width="0.4064" layer="1"/>
 <wire x1="25.185" y1="10.31875" x2="25.185" y2="8.80655" width="0.4064" layer="1"/>
@@ -28159,7 +28163,7 @@ Please make sure your boards conform to 
 <wire x1="8.5725" y1="6.985" x2="6.0325" y2="9.525" width="0.4064" layer="16"/>
 <wire x1="6.0325" y1="9.525" x2="5.6925" y2="9.525" width="0.4064" layer="16"/>
 <wire x1="5.6925" y1="9.525" x2="5.5525" y2="9.385" width="0.4064" layer="16"/>
-<contactref element="U$3" pad="2"/>
+<contactref element="RA1" pad="2"/>
 <wire x1="25.19045" y1="7.2263" x2="24.21255" y2="7.2263" width="0.4064" layer="1"/>
 <wire x1="24.21255" y1="7.2263" x2="23.97125" y2="6.985" width="0.4064" layer="1"/>
 </signal>
@@ -28171,7 +28175,7 @@ Please make sure your boards conform to 
 <wire x1="9.8425" y1="7.62" x2="6.0325" y2="11.43" width="0.4064" layer="16"/>
 <wire x1="6.0325" y1="11.43" x2="5.7075" y2="11.43" width="0.4064" layer="16"/>
 <wire x1="5.7075" y1="11.43" x2="5.5525" y2="11.585" width="0.4064" layer="16"/>
-<contactref element="U$3" pad="3"/>
+<contactref element="RA1" pad="3"/>
 <wire x1="25.19045" y1="8.0137" x2="23.72995" y2="8.0137" width="0.4064" layer="1"/>
 <wire x1="23.72995" y1="8.0137" x2="23.65375" y2="7.9375" width="0.4064" layer="1"/>
 </signal>
@@ -28357,8 +28361,8 @@ Please make sure your boards conform to 
 </polygon>
 </signal>
 <signal name="N$46">
-<contactref element="3.3V_LDO_REG" pad="6"/>
-<contactref element="3.3V_LDO_REG" pad="5"/>
+<contactref element="3.3V_LDO" pad="6"/>
+<contactref element="3.3V_LDO" pad="5"/>
 <contactref element="C20" pad="1"/>
 <wire x1="31.4325" y1="38.4175" x2="31.4325" y2="35.2425" width="0.6096" layer="1"/>
 <wire x1="31.4325" y1="35.2425" x2="31.4325" y2="34.29" width="0.6096" layer="1"/>
@@ -28373,8 +28377,8 @@ Please make sure your boards conform to 
 <wire x1="31.4325" y1="32.385" x2="31.33" y2="32.385" width="0.6096" layer="1"/>
 </signal>
 <signal name="N$47">
-<contactref element="3.3V_LDO_REG" pad="4"/>
-<contactref element="3.3V_LDO_REG" pad="3"/>
+<contactref element="3.3V_LDO" pad="4"/>
+<contactref element="3.3V_LDO" pad="3"/>
 <contactref element="C21" pad="1"/>
 <contactref element="L2" pad="1"/>
 <wire x1="24.3875" y1="35.2425" x2="22.38375" y2="35.2425" width="0.6096" layer="1"/>
diff --git a/master/master.sch b/master/master.sch
--- a/master/master.sch
+++ b/master/master.sch
@@ -5424,6 +5424,8 @@ www.irf.com&lt;p&gt;
 <circle x="0" y="0" radius="2.4" width="0.127" layer="21"/>
 <smd name="V+" x="3.8" y="0.75" dx="2" dy="0.5" layer="1"/>
 <smd name="V-" x="3.8" y="-0.75" dx="2" dy="0.5" layer="1"/>
+<text x="-2.54" y="2.54" size="1.016" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-3.81" size="1.016" layer="27">&gt;VALUE</text>
 </package>
 </packages>
 <symbols>
@@ -5493,6 +5495,8 @@ www.irf.com&lt;p&gt;
 <pin name="V-" x="-10.16" y="0" visible="pad"/>
 <wire x1="-1.778" y1="0" x2="-1.778" y2="-1.27" width="0.508" layer="94"/>
 <wire x1="-2.54" y1="0" x2="-1.778" y2="0" width="0.127" layer="94"/>
+<text x="-2.54" y="5.08" size="1.016" layer="95">&gt;NAME</text>
+<text x="-2.54" y="-5.08" size="1.016" layer="96">&gt;VALUE</text>
 </symbol>
 </symbols>
 <devicesets>
@@ -5894,7 +5898,7 @@ There are 2 variants that must be carefu
 <part name="TEMP" library="SeniorDesign" deviceset="MCP9800" device=""/>
 <part name="P+10" library="SparkFun" deviceset="3.3V" device=""/>
 <part name="GND21" library="supply1" deviceset="GND" device=""/>
-<part name="5V_SWITCHING" library="SeniorDesign" deviceset="IFX91041EJ" device="" value="IFX91041EJ V50"/>
+<part name="5V_SW" library="SeniorDesign" deviceset="IFX91041EJ" device="" value="IFX91041EJ V50"/>
 <part name="GND23" library="SparkFun" deviceset="GND" device=""/>
 <part name="C12" library="SparkFun" deviceset="CAP" device="0805" value="10uF"/>
 <part name="GND24" library="SparkFun" deviceset="GND" device=""/>
@@ -5909,7 +5913,7 @@ There are 2 variants that must be carefu
 <part name="C18" library="SparkFun" deviceset="CAP" device="1210" value="47uF"/>
 <part name="C19" library="SparkFun" deviceset="CAP" device="0603-CAP" value="220nF"/>
 <part name="GND27" library="SparkFun" deviceset="GND" device=""/>
-<part name="3.3V_LDO_REG" library="SeniorDesign" deviceset="TPS76833QD" device=""/>
+<part name="3.3V_LDO" library="SeniorDesign" deviceset="TPS76833QD" device=""/>
 <part name="GND28" library="SparkFun" deviceset="GND" device=""/>
 <part name="U$10" library="SparkFun" deviceset="5V" device=""/>
 <part name="C21" library="SparkFun" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
@@ -5925,7 +5929,7 @@ There are 2 variants that must be carefu
 <part name="U7" library="SeniorDesign" deviceset="24AA32AFT" device=""/>
 <part name="P+5" library="SparkFun" deviceset="3.3V" device=""/>
 <part name="GND16" library="supply1" deviceset="GND" device=""/>
-<part name="U$7" library="SeniorDesign" deviceset="MS412FE-FL26E" device=""/>
+<part name="B1" library="SeniorDesign" deviceset="MS412FE-FL26E" device=""/>
 <part name="GND33" library="supply1" deviceset="GND" device=""/>
 <part name="P+12" library="SparkFun" deviceset="3.3V" device=""/>
 <part name="D2" library="SparkFun" deviceset="DIODE" device="SOD" value="SCHOTTKEY"/>
@@ -5971,7 +5975,7 @@ There are 2 variants that must be carefu
 <part name="GND42" library="supply1" deviceset="GND" device=""/>
 <part name="X1" library="con-coax" deviceset="SMA-" device="142-0711-821/826"/>
 <part name="X3" library="con-coax" deviceset="SMA-" device="142-0711-821/826"/>
-<part name="U$3" library="Protofusion" deviceset="RES-ARRAY" device="" value="4.7k"/>
+<part name="RA1" library="Protofusion" deviceset="RES-ARRAY" device="" value="4.7k"/>
 <part name="JTAG" library="SLAT-CON-JST-ZH" deviceset="ZH-V-4-1" device=""/>
 <part name="AUX5" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="BLUE"/>
 <part name="GND17" library="supply1" deviceset="GND" device=""/>
@@ -6146,7 +6150,7 @@ Maybe use bigger R's</text>
 <instance part="TEMP" gate="G$1" x="147.32" y="154.94"/>
 <instance part="P+10" gate="G$1" x="127" y="165.1"/>
 <instance part="GND21" gate="1" x="127" y="149.86"/>
-<instance part="5V_SWITCHING" gate="G$1" x="58.42" y="43.18"/>
+<instance part="5V_SW" gate="G$1" x="58.42" y="43.18"/>
 <instance part="GND23" gate="1" x="40.64" y="25.4"/>
 <instance part="C12" gate="G$1" x="25.4" y="35.56"/>
 <instance part="GND24" gate="1" x="12.7" y="43.18"/>
@@ -6172,7 +6176,7 @@ Maybe use bigger R's</text>
 <instance part="C18" gate="G$1" x="119.38" y="27.94"/>
 <instance part="C19" gate="G$1" x="109.22" y="27.94"/>
 <instance part="GND27" gate="1" x="114.3" y="17.78"/>
-<instance part="3.3V_LDO_REG" gate="G$1" x="157.48" y="33.02"/>
+<instance part="3.3V_LDO" gate="G$1" x="157.48" y="33.02"/>
 <instance part="GND28" gate="1" x="137.16" y="17.78"/>
 <instance part="U$10" gate="G$1" x="137.16" y="60.96" smashed="yes">
 <attribute name="VALUE" x="136.144" y="64.516" size="1.778" layer="96"/>
@@ -6196,7 +6200,7 @@ Maybe use bigger R's</text>
 <instance part="U7" gate="G$1" x="30.48" y="182.88"/>
 <instance part="P+5" gate="G$1" x="15.24" y="190.5"/>
 <instance part="GND16" gate="1" x="15.24" y="175.26"/>
-<instance part="U$7" gate="G$1" x="111.76" y="205.74" rot="R90"/>
+<instance part="B1" gate="G$1" x="111.76" y="205.74" rot="R90"/>
 <instance part="GND33" gate="1" x="111.76" y="190.5"/>
 <instance part="P+12" gate="G$1" x="111.76" y="238.76"/>
 <instance part="D2" gate="G$1" x="111.76" y="233.68" smashed="yes" rot="R270">
@@ -6270,10 +6274,10 @@ Maybe use bigger R's</text>
 <instance part="GND42" gate="1" x="88.9" y="109.22"/>
 <instance part="X1" gate="G1" x="142.24" y="236.22"/>
 <instance part="X3" gate="G1" x="20.32" y="139.7"/>
-<instance part="U$3" gate="A" x="63.5" y="81.28"/>
-<instance part="U$3" gate="B" x="50.8" y="104.14" rot="R180"/>
-<instance part="U$3" gate="C" x="71.12" y="99.06" rot="R180"/>
-<instance part="U$3" gate="D" x="60.96" y="101.6" rot="R180"/>
+<instance part="RA1" gate="A" x="63.5" y="81.28"/>
+<instance part="RA1" gate="B" x="50.8" y="104.14" rot="R180"/>
+<instance part="RA1" gate="C" x="71.12" y="99.06" rot="R180"/>
+<instance part="RA1" gate="D" x="60.96" y="101.6" rot="R180"/>
 <instance part="JTAG" gate="G$1" x="358.14" y="218.44" rot="MR0"/>
 <instance part="AUX5" gate="G$1" x="210.82" y="175.26" smashed="yes">
 <attribute name="NAME" x="209.296" y="175.768" size="1.778" layer="95" rot="R90"/>
@@ -6447,7 +6451,7 @@ Maybe use bigger R's</text>
 <wire x1="30.48" y1="12.7" x2="30.48" y2="10.16" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="GND"/>
+<pinref part="5V_SW" gate="G$1" pin="GND"/>
 <wire x1="43.18" y1="38.1" x2="40.64" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="GND23" gate="1" pin="GND"/>
 <wire x1="40.64" y1="38.1" x2="40.64" y2="30.48" width="0.1524" layer="91"/>
@@ -6468,7 +6472,7 @@ Maybe use bigger R's</text>
 <wire x1="7.62" y1="30.48" x2="7.62" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="SYNC"/>
+<pinref part="5V_SW" gate="G$1" pin="SYNC"/>
 <wire x1="43.18" y1="48.26" x2="12.7" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="12.7" y1="48.26" x2="12.7" y2="45.72" width="0.1524" layer="91"/>
 <pinref part="GND24" gate="1" pin="GND"/>
@@ -6497,11 +6501,11 @@ Maybe use bigger R's</text>
 <junction x="114.3" y="22.86"/>
 </segment>
 <segment>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="GND"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="GND"/>
 <wire x1="142.24" y1="25.4" x2="137.16" y2="25.4" width="0.1524" layer="91"/>
 <pinref part="GND28" gate="1" pin="GND"/>
 <wire x1="137.16" y1="25.4" x2="137.16" y2="20.32" width="0.1524" layer="91"/>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="!EN"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="!EN"/>
 <wire x1="142.24" y1="30.48" x2="137.16" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="137.16" y1="30.48" x2="137.16" y2="25.4" width="0.1524" layer="91"/>
 <junction x="137.16" y="25.4"/>
@@ -6560,7 +6564,7 @@ Maybe use bigger R's</text>
 <label x="43.18" y="187.96" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U$7" gate="G$1" pin="V-"/>
+<pinref part="B1" gate="G$1" pin="V-"/>
 <pinref part="GND33" gate="1" pin="GND"/>
 <wire x1="111.76" y1="193.04" x2="111.76" y2="195.58" width="0.1524" layer="91"/>
 </segment>
@@ -6736,7 +6740,7 @@ Maybe use bigger R's</text>
 <segment>
 <wire x1="66.04" y1="99.06" x2="38.1" y2="99.06" width="0.1524" layer="91"/>
 <label x="38.1" y="99.06" size="1.778" layer="95"/>
-<pinref part="U$3" gate="C" pin="2"/>
+<pinref part="RA1" gate="C" pin="2"/>
 </segment>
 </net>
 <net name="MISO" class="0">
@@ -6753,7 +6757,7 @@ Maybe use bigger R's</text>
 <segment>
 <wire x1="45.72" y1="104.14" x2="38.1" y2="104.14" width="0.1524" layer="91"/>
 <label x="38.1" y="104.14" size="1.778" layer="95"/>
-<pinref part="U$3" gate="B" pin="2"/>
+<pinref part="RA1" gate="B" pin="2"/>
 </segment>
 </net>
 <net name="MOSI" class="0">
@@ -6770,7 +6774,7 @@ Maybe use bigger R's</text>
 <segment>
 <label x="38.1" y="101.6" size="1.778" layer="95"/>
 <wire x1="55.88" y1="101.6" x2="38.1" y2="101.6" width="0.1524" layer="91"/>
-<pinref part="U$3" gate="D" pin="2"/>
+<pinref part="RA1" gate="D" pin="2"/>
 </segment>
 </net>
 <net name="RESET" class="0">
@@ -7071,7 +7075,7 @@ Maybe use bigger R's</text>
 <pinref part="U$1" gate="G$1" pin="5V"/>
 </segment>
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="FB"/>
+<pinref part="5V_SW" gate="G$1" pin="FB"/>
 <wire x1="73.66" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="43.18" x2="83.82" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="U$9" gate="G$1" pin="5V"/>
@@ -7236,7 +7240,7 @@ Maybe use bigger R's</text>
 <segment>
 <pinref part="Q6" gate="G$1" pin="S"/>
 <wire x1="17.78" y1="33.02" x2="17.78" y2="45.72" width="0.1524" layer="91"/>
-<pinref part="5V_SWITCHING" gate="G$1" pin="VS"/>
+<pinref part="5V_SW" gate="G$1" pin="VS"/>
 <label x="30.48" y="45.72" size="1.778" layer="95"/>
 <wire x1="17.78" y1="45.72" x2="25.4" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="25.4" y1="45.72" x2="35.56" y2="45.72" width="0.1524" layer="91"/>
@@ -7245,7 +7249,7 @@ Maybe use bigger R's</text>
 <pinref part="C12" gate="G$1" pin="1"/>
 <wire x1="40.64" y1="43.18" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="25.4" y1="40.64" x2="25.4" y2="45.72" width="0.1524" layer="91"/>
-<pinref part="5V_SWITCHING" gate="G$1" pin="EN"/>
+<pinref part="5V_SW" gate="G$1" pin="EN"/>
 <wire x1="43.18" y1="43.18" x2="40.64" y2="43.18" width="0.1524" layer="91"/>
 <junction x="40.64" y="45.72"/>
 <junction x="25.4" y="45.72"/>
@@ -7271,7 +7275,7 @@ Maybe use bigger R's</text>
 </net>
 <net name="N$4" class="0">
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="COMP"/>
+<pinref part="5V_SW" gate="G$1" pin="COMP"/>
 <wire x1="73.66" y1="38.1" x2="76.2" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="C10" gate="G$1" pin="1"/>
 <wire x1="76.2" y1="38.1" x2="76.2" y2="35.56" width="0.1524" layer="91"/>
@@ -7287,14 +7291,14 @@ Maybe use bigger R's</text>
 </net>
 <net name="N$19" class="0">
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="BDS"/>
+<pinref part="5V_SW" gate="G$1" pin="BDS"/>
 <pinref part="C16" gate="G$1" pin="1"/>
 <wire x1="73.66" y1="48.26" x2="76.2" y2="48.26" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$21" class="0">
 <segment>
-<pinref part="5V_SWITCHING" gate="G$1" pin="BUO"/>
+<pinref part="5V_SW" gate="G$1" pin="BUO"/>
 <pinref part="C16" gate="G$1" pin="2"/>
 <wire x1="83.82" y1="48.26" x2="86.36" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="86.36" y1="48.26" x2="86.36" y2="45.72" width="0.1524" layer="91"/>
@@ -7380,7 +7384,7 @@ Maybe use bigger R's</text>
 </net>
 <net name="N$32" class="0">
 <segment>
-<pinref part="U$7" gate="G$1" pin="V+"/>
+<pinref part="B1" gate="G$1" pin="V+"/>
 <pinref part="R3" gate="G$1" pin="2"/>
 <wire x1="111.76" y1="215.9" x2="111.76" y2="213.36" width="0.1524" layer="91"/>
 </segment>
@@ -7540,21 +7544,21 @@ Maybe use bigger R's</text>
 <wire x1="76.2" y1="106.68" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
 <junction x="76.2" y="101.6"/>
 <wire x1="66.04" y1="101.6" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
-<pinref part="U$3" gate="D" pin="1"/>
+<pinref part="RA1" gate="D" pin="1"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
 <wire x1="55.88" y1="104.14" x2="91.44" y2="104.14" width="0.1524" layer="91"/>
 <pinref part="MICROSD" gate="G$1" pin="DATA_OUT"/>
-<pinref part="U$3" gate="B" pin="1"/>
+<pinref part="RA1" gate="B" pin="1"/>
 </segment>
 </net>
 <net name="N$7" class="0">
 <segment>
 <pinref part="MICROSD" gate="G$1" pin="SCLK"/>
 <wire x1="76.2" y1="99.06" x2="91.44" y2="99.06" width="0.1524" layer="91"/>
-<pinref part="U$3" gate="C" pin="1"/>
+<pinref part="RA1" gate="C" pin="1"/>
 </segment>
 </net>
 <net name="SD_DETECT" class="0">
@@ -7635,9 +7639,9 @@ Maybe use bigger R's</text>
 </net>
 <net name="N$46" class="0">
 <segment>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="OUT1"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="OUT1"/>
 <wire x1="172.72" y1="30.48" x2="180.34" y2="30.48" width="0.1524" layer="91"/>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="OUT2"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="OUT2"/>
 <wire x1="172.72" y1="25.4" x2="180.34" y2="25.4" width="0.1524" layer="91"/>
 <wire x1="180.34" y1="25.4" x2="180.34" y2="30.48" width="0.1524" layer="91"/>
 <junction x="180.34" y="30.48"/>
@@ -7650,10 +7654,10 @@ Maybe use bigger R's</text>
 </net>
 <net name="N$47" class="0">
 <segment>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="IN2"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="IN2"/>
 <wire x1="137.16" y1="40.64" x2="137.16" y2="35.56" width="0.1524" layer="91"/>
 <wire x1="137.16" y1="35.56" x2="142.24" y2="35.56" width="0.1524" layer="91"/>
-<pinref part="3.3V_LDO_REG" gate="G$1" pin="IN1"/>
+<pinref part="3.3V_LDO" gate="G$1" pin="IN1"/>
 <wire x1="142.24" y1="40.64" x2="137.16" y2="40.64" width="0.1524" layer="91"/>
 <junction x="137.16" y="40.64"/>
 <wire x1="137.16" y1="40.64" x2="129.54" y2="40.64" width="0.1524" layer="91"/>