diff --git a/ProtoModule.sch b/ProtoModule.sch
--- a/ProtoModule.sch
+++ b/ProtoModule.sch
@@ -55,6 +55,7 @@
 <layer number="55" name="dxf2" color="5" fill="1" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="58" name="bRefDes" color="7" fill="1" visible="no" active="no"/>
 <layer number="59" name="tCarbon" color="7" fill="1" visible="no" active="no"/>
 <layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
 <layer number="61" name="pt_docu" color="7" fill="1" visible="no" active="no"/>
@@ -124,6 +125,14 @@
 <layer number="153" name="FabDoc1" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="154" name="FabDoc2" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="155" name="FabDoc3" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="156" name="DOC-1" color="7" fill="1" visible="no" active="yes"/>
+<layer number="157" name="DOC-2" color="7" fill="1" visible="no" active="yes"/>
+<layer number="158" name="DOC-3" color="7" fill="1" visible="no" active="yes"/>
+<layer number="159" name="DOC-4" color="7" fill="1" visible="no" active="yes"/>
+<layer number="160" name="DOC-5" color="7" fill="1" visible="no" active="yes"/>
+<layer number="161" name="DOC-6" color="7" fill="1" visible="no" active="yes"/>
+<layer number="162" name="DOC-7" color="7" fill="1" visible="no" active="yes"/>
+<layer number="163" name="DOC-8" color="7" fill="1" visible="no" active="yes"/>
 <layer number="190" name="Comments" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="191" name="mNets" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="192" name="mBusses" color="7" fill="1" visible="yes" active="yes"/>
@@ -233,7 +242,7 @@
 <smd name="30" x="-1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
 <smd name="31" x="-2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
 <smd name="32" x="-2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
-<text x="-3" y="5" size="1.27" layer="25" font="vector" ratio="10">&gt;NAME</text>
+<text x="-3" y="5" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 <rectangle x1="-4.185" y1="2.3" x2="-3.815" y2="3.3" layer="51" rot="R270"/>
 <rectangle x1="-4.185" y1="1.5" x2="-3.815" y2="2.5" layer="51" rot="R270"/>
 <rectangle x1="-4.185" y1="-3.3" x2="-3.815" y2="-2.3" layer="51" rot="R270"/>
@@ -301,27 +310,6 @@
 <text x="-1.0255" y="1.959" size="0.4064" layer="25">&gt;NAME</text>
 <text x="-0.9525" y="-0.3905" size="0.4064" layer="27">&gt;VALUE</text>
 </package>
-<package name="POGOPROG-CONN-4-ALLSMT">
-<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
-<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="0.635"/>
-<vertex x="0.635" y="0.635"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="-0.635" y="1.905"/>
-</polygon>
-<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
-<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
-<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
-<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
-</package>
 <package name="ABM8G">
 <wire x1="1.6" y1="1.25" x2="1.6" y2="-1.25" width="0.127" layer="51"/>
 <wire x1="1.6" y1="-1.25" x2="-1.6" y2="-1.25" width="0.127" layer="51"/>
@@ -428,15 +416,6 @@
 <text x="-10.16" y="13.97" size="1.27" layer="95">&gt;Name</text>
 <text x="-10.16" y="-15.24" size="1.27" layer="96">&gt;Value</text>
 </symbol>
-<symbol name="POGOPROG-CONN-4">
-<pin name="SWDIO" x="-2.54" y="-2.54" length="short"/>
-<pin name="SWCLK" x="-2.54" y="0" length="short"/>
-<pin name="VCC" x="-2.54" y="5.08" length="short"/>
-<pin name="GND" x="-2.54" y="2.54" length="short"/>
-<text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
-<text x="0" y="-5.08" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
-<rectangle x1="0" y1="-3.81" x2="1.27" y2="6.35" layer="94"/>
-</symbol>
 <symbol name="CRYSTAL">
 <description>Crystal symbol</description>
 <wire x1="1.016" y1="0" x2="2.54" y2="0" width="0.1524" layer="94"/>
@@ -475,6 +454,7 @@
 </symbols>
 <devicesets>
 <deviceset name="STM32F042K-T" prefix="U">
+<description>STM32F0 Microcontroller</description>
 <gates>
 <gate name="G$1" symbol="STM32F042K-T" x="5.08" y="0"/>
 </gates>
@@ -520,6 +500,7 @@
 </devices>
 </deviceset>
 <deviceset name="SN65HVD234" prefix="U">
+<description>CAN Transceiver</description>
 <gates>
 <gate name="G$1" symbol="SN65HVD234" x="0" y="0"/>
 </gates>
@@ -562,24 +543,6 @@
 </device>
 </devices>
 </deviceset>
-<deviceset name="POGOPIN-CONN-4" prefix="J">
-<gates>
-<gate name="G$1" symbol="POGOPROG-CONN-4" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="POGOPROG-CONN-4-ALLSMT">
-<connects>
-<connect gate="G$1" pin="GND" pad="2"/>
-<connect gate="G$1" pin="SWCLK" pad="3"/>
-<connect gate="G$1" pin="SWDIO" pad="4"/>
-<connect gate="G$1" pin="VCC" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="CRYSTAL" prefix="Y">
 <description>TSX-3225 crystal oscillator</description>
 <gates>
@@ -609,6 +572,7 @@
 </devices>
 </deviceset>
 <deviceset name="JST-PA-4" prefix="J1">
+<description>JST PA Series Connector</description>
 <gates>
 <gate name="J1" symbol="M04" x="0" y="-2.54"/>
 </gates>
@@ -3660,6 +3624,140 @@ Standard 14-pin 0.1" header. Use with st
 </deviceset>
 </devicesets>
 </library>
+<library name="SLAT-Connectors">
+<description>SLAT Connectors</description>
+<packages>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-0.635" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="2" x="0" y="0.635" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="4" x="0" y="-1.905" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="1" x="0" y="1.905" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<wire x1="-0.635" y1="2.54" x2="0.635" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.635" y1="2.54" x2="0.635" y2="-2.54" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-2.54" x2="-0.635" y2="-2.54" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-2.54" x2="-0.635" y2="2.54" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.27"/>
+<vertex x="0.635" y="1.27"/>
+<vertex x="0.635" y="2.54"/>
+<vertex x="-0.635" y="2.54"/>
+</polygon>
+<text x="-1.27" y="-3.175" size="1.27" layer="25" rot="R90">&gt;NAME</text>
+<text x="2.54" y="-3.175" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
+</package>
+<package name="HEADER_4_050_RT">
+<wire x1="-0.762" y1="0.762" x2="-0.762" y2="-0.762" width="0.1778" layer="21"/>
+<wire x1="-0.762" y1="-0.762" x2="4.572" y2="-0.762" width="0.1778" layer="21"/>
+<wire x1="4.572" y1="-0.762" x2="4.572" y2="0.762" width="0.1778" layer="21"/>
+<wire x1="4.572" y1="0.762" x2="-0.762" y2="0.762" width="0.1778" layer="21"/>
+<pad name="1" x="0" y="0" drill="0.5588" diameter="1.0668" shape="square"/>
+<pad name="2" x="1.27" y="0" drill="0.5588" diameter="1.0668"/>
+<pad name="3" x="2.54" y="0" drill="0.5588" diameter="1.0668"/>
+<pad name="4" x="3.81" y="0" drill="0.5588" diameter="1.0668"/>
+<text x="-0.254" y="-2.032" size="1.016" layer="25" font="vector" ratio="13">&gt;NAME</text>
+<text x="-0.762" y="-3.302" size="1.016" layer="27" font="vector" ratio="13">&gt;VALUE</text>
+<wire x1="0" y1="0" x2="0" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="1.27" y1="0" x2="1.27" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="0" x2="2.54" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="0" x2="3.81" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="4.572" y1="1.7526" x2="3.81" y2="1.7526" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="1.7526" x2="2.54" y2="1.7526" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="1.7526" x2="1.27" y2="1.7526" width="0.2032" layer="51"/>
+<wire x1="1.27" y1="1.7526" x2="0" y2="1.7526" width="0.2032" layer="51"/>
+<wire x1="0" y1="1.7526" x2="-0.762" y2="1.7526" width="0.2032" layer="51"/>
+<wire x1="4.572" y1="0.762" x2="3.81" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="0.762" x2="2.54" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="2.54" y1="0.762" x2="1.27" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="1.27" y1="0.762" x2="0" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="0" y1="0.762" x2="-0.762" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="-0.762" y1="1.7526" x2="-0.762" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="4.572" y1="1.7526" x2="4.572" y2="0.762" width="0.2032" layer="51"/>
+<wire x1="0" y1="1.7526" x2="0" y2="4.7498" width="0.635" layer="51"/>
+<wire x1="1.27" y1="1.7526" x2="1.27" y2="4.7498" width="0.635" layer="51"/>
+<wire x1="2.54" y1="1.7526" x2="2.54" y2="4.7498" width="0.635" layer="51"/>
+<wire x1="3.81" y1="1.7526" x2="3.81" y2="4.7498" width="0.635" layer="51"/>
+<rectangle x1="-0.762" y1="0.762" x2="4.572" y2="1.778" layer="51"/>
+<wire x1="-0.762" y1="0.762" x2="-0.762" y2="5.08" width="0.2032" layer="21"/>
+<wire x1="-0.762" y1="5.08" x2="4.572" y2="5.08" width="0.2032" layer="21"/>
+<wire x1="4.572" y1="5.08" x2="4.572" y2="0.762" width="0.2032" layer="21"/>
+<wire x1="0" y1="1.524" x2="0" y2="4.318" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="1.524" x2="1.27" y2="4.318" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="1.524" x2="2.54" y2="4.318" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="1.524" x2="3.81" y2="4.318" width="0.2032" layer="21"/>
+</package>
+<package name="HEADER_4_050">
+<wire x1="-0.762" y1="0.762" x2="-0.762" y2="-0.762" width="0.1778" layer="21"/>
+<wire x1="-0.762" y1="-0.762" x2="4.572" y2="-0.762" width="0.1778" layer="21"/>
+<wire x1="4.572" y1="-0.762" x2="4.572" y2="0.762" width="0.1778" layer="21"/>
+<wire x1="4.572" y1="0.762" x2="-0.762" y2="0.762" width="0.1778" layer="21"/>
+<pad name="1" x="0" y="0" drill="0.7366" diameter="1.1" shape="square"/>
+<pad name="2" x="1.27" y="0" drill="0.7366" diameter="1.1"/>
+<pad name="3" x="2.54" y="0" drill="0.7366" diameter="1.1"/>
+<pad name="4" x="3.81" y="0" drill="0.7366" diameter="1.1"/>
+<text x="0" y="1.27" size="1.016" layer="25" font="vector" ratio="13">&gt;NAME</text>
+<text x="0" y="-2.54" size="1.016" layer="27" font="vector" ratio="13">&gt;VALUE</text>
+<rectangle x1="-0.762" y1="-0.762" x2="0.762" y2="0.762" layer="21"/>
+</package>
+</packages>
+<symbols>
+<symbol name="POGOPROG-CONN-4">
+<pin name="SWCLK" x="-2.54" y="0" length="short"/>
+<pin name="SWDIO" x="-2.54" y="-2.54" length="short"/>
+<pin name="VCC" x="-2.54" y="5.08" length="short" direction="pwr"/>
+<pin name="GND" x="-2.54" y="2.54" length="short" direction="sup"/>
+<text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
+<text x="0" y="-5.08" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
+<rectangle x1="0" y1="-3.81" x2="1.27" y2="6.35" layer="94"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="SWD" prefix="J" uservalue="yes">
+<description>Serial Wire Debug (SWD)&lt;br&gt;
+Programming &amp; Debug - 4 Wire&lt;br&gt;
+&lt;br&gt;
+&lt;a href="http://www.digikey.com/product-detail/en/GRPB041VWVN-RC/S9014E-04-ND/1786440"&gt;Digi-Key CON VT&lt;/a&gt;&lt;br&gt;
+&lt;a href="http://www.digikey.com/product-detail/en/GRPB041VWCN-RC/S9016E-04-ND/1786467"&gt;Digi-Key CON RT&lt;/a&gt;</description>
+<gates>
+<gate name="G$1" symbol="POGOPROG-CONN-4" x="0" y="0"/>
+</gates>
+<devices>
+<device name="POGO" package="POGOPROG-CONN-4-ALLSMT">
+<connects>
+<connect gate="G$1" pin="GND" pad="2"/>
+<connect gate="G$1" pin="SWCLK" pad="3"/>
+<connect gate="G$1" pin="SWDIO" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="VT" package="HEADER_4_050">
+<connects>
+<connect gate="G$1" pin="GND" pad="2"/>
+<connect gate="G$1" pin="SWCLK" pad="3"/>
+<connect gate="G$1" pin="SWDIO" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="RT" package="HEADER_4_050_RT">
+<connects>
+<connect gate="G$1" pin="GND" pad="2"/>
+<connect gate="G$1" pin="SWCLK" pad="3"/>
+<connect gate="G$1" pin="SWDIO" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -3713,7 +3811,6 @@ Standard 14-pin 0.1" header. Use with st
 <part name="GND11" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="D6" library="SparkFun-DiscreteSemi" deviceset="DIODE-SCHOTTKY" device="-BAT20J" value=""/>
 <part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0805" value="10uF"/>
-<part name="J3" library="Protofusion" deviceset="POGOPIN-CONN-4" device="" value=""/>
 <part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="VIN" device=""/>
 <part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="VIN" device=""/>
@@ -3729,6 +3826,7 @@ Standard 14-pin 0.1" header. Use with st
 <part name="J2" library="Protofusion" deviceset="JST-PA-4" device="PTH"/>
 <part name="JP1" library="SparkFun-Connectors" deviceset="M14" device="LOCK"/>
 <part name="SUPPLY10" library="SparkFun-Aesthetics" deviceset="VDD" device="" value="V+"/>
+<part name="J3" library="SLAT-Connectors" deviceset="SWD" device="VT"/>
 </parts>
 <sheets>
 <sheet>
@@ -3798,7 +3896,6 @@ Standard 14-pin 0.1" header. Use with st
 <attribute name="VALUE" x="98.044" y="122.9614" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="C8" gate="G$1" x="114.3" y="101.6"/>
-<instance part="J3" gate="G$1" x="129.54" y="157.48"/>
 <instance part="SUPPLY7" gate="G$1" x="124.46" y="165.1"/>
 <instance part="SUPPLY4" gate="G$1" x="71.12" y="165.1"/>
 <instance part="SUPPLY5" gate="G$1" x="96.52" y="165.1"/>
@@ -3814,6 +3911,7 @@ Standard 14-pin 0.1" header. Use with st
 <instance part="J2" gate="J1" x="104.14" y="160.02" rot="R180"/>
 <instance part="JP1" gate="G$1" x="218.44" y="132.08" rot="R180"/>
 <instance part="SUPPLY10" gate="VDD" x="45.72" y="121.92"/>
+<instance part="J3" gate="G$1" x="129.54" y="157.48"/>
 </instances>
 <busses>
 </busses>
@@ -3886,8 +3984,8 @@ Standard 14-pin 0.1" header. Use with st
 <segment>
 <pinref part="SUPPLY7" gate="G$1" pin="3.3V"/>
 <wire x1="124.46" y1="165.1" x2="124.46" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="124.46" y1="162.56" x2="127" y2="162.56" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="VCC"/>
-<wire x1="124.46" y1="162.56" x2="127" y2="162.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="3"/>
@@ -3997,11 +4095,6 @@ Standard 14-pin 0.1" header. Use with st
 <junction x="114.3" y="88.9"/>
 </segment>
 <segment>
-<pinref part="J3" gate="G$1" pin="GND"/>
-<wire x1="127" y1="160.02" x2="121.92" y2="160.02" width="0.1524" layer="91"/>
-<label x="121.92" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-<segment>
 <pinref part="C2" gate="G$1" pin="1"/>
 <wire x1="15.24" y1="12.7" x2="15.24" y2="10.16" width="0.1524" layer="91"/>
 <pinref part="C4" gate="G$1" pin="2"/>
@@ -4019,6 +4112,11 @@ Standard 14-pin 0.1" header. Use with st
 <pinref part="JP1" gate="G$1" pin="1"/>
 <label x="203.2" y="149.86" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<wire x1="127" y1="160.02" x2="121.92" y2="160.02" width="0.1524" layer="91"/>
+<label x="121.92" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J3" gate="G$1" pin="GND"/>
+</segment>
 </net>
 <net name="CAN_H" class="0">
 <segment>
@@ -4147,7 +4245,7 @@ Standard 14-pin 0.1" header. Use with st
 <wire x1="30.48" y1="149.86" x2="33.02" y2="149.86" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="SDI" class="0">
+<net name="MOSI" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 <wire x1="119.38" y1="55.88" x2="124.46" y2="55.88" width="0.1524" layer="91"/>
@@ -4171,7 +4269,7 @@ Standard 14-pin 0.1" header. Use with st
 <label x="203.2" y="119.38" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="SDO" class="0">
+<net name="MISO" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 <wire x1="119.38" y1="53.34" x2="124.46" y2="53.34" width="0.1524" layer="91"/>
@@ -4183,7 +4281,7 @@ Standard 14-pin 0.1" header. Use with st
 <label x="203.2" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="!CS" class="0">
+<net name="PA15" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 <wire x1="119.38" y1="45.72" x2="124.46" y2="45.72" width="0.1524" layer="91"/>
@@ -4253,9 +4351,9 @@ Standard 14-pin 0.1" header. Use with st
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<pinref part="J3" gate="G$1" pin="SWCLK"/>
 <wire x1="127" y1="157.48" x2="121.92" y2="157.48" width="0.1524" layer="91"/>
 <label x="121.92" y="157.48" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J3" gate="G$1" pin="SWCLK"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
@@ -4265,9 +4363,9 @@ Standard 14-pin 0.1" header. Use with st
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="J3" gate="G$1" pin="SWDIO"/>
 <wire x1="127" y1="154.94" x2="121.92" y2="154.94" width="0.1524" layer="91"/>
 <label x="121.92" y="154.94" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J3" gate="G$1" pin="SWDIO"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
@@ -4357,7 +4455,7 @@ Standard 14-pin 0.1" header. Use with st
 <label x="203.2" y="147.32" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="GPIO4" class="0">
+<net name="PB0" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="PB0/ADC8"/>
 <wire x1="38.1" y1="25.4" x2="35.56" y2="25.4" width="0.1524" layer="91"/>
@@ -4393,7 +4491,7 @@ Standard 14-pin 0.1" header. Use with st
 <label x="203.2" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="GPIO1" class="0">
+<net name="PA0" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="PA0/ADC0"/>
 <wire x1="38.1" y1="48.26" x2="35.56" y2="48.26" width="0.1524" layer="91"/>
@@ -4405,7 +4503,7 @@ Standard 14-pin 0.1" header. Use with st
 <label x="203.2" y="142.24" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="GPIO5" class="0">
+<net name="PB1" class="0">
 <segment>
 <pinref part="U1" gate="G$1" pin="PB1/ADC9"/>
 <wire x1="38.1" y1="22.86" x2="35.56" y2="22.86" width="0.1524" layer="91"/>