diff --git a/patchfiles/Moog_Minitaur.midnam b/patchfiles/Moog_Minitaur.midnam
index 76f2b1b440..a279fc4e11 100644
--- a/patchfiles/Moog_Minitaur.midnam
+++ b/patchfiles/Moog_Minitaur.midnam
@@ -14,113 +14,115 @@
       <AvailableForChannels>
         <AvailableChannel Channel="1" Available="true"/>
       </AvailableForChannels>
-      <UsesControlNameList Name="Modulation"/>
-      <PatchBank Name="Patches">
-        <PatchNameList>
-          <Patch Number="1" Name="Patch 1" ProgramChange="0"/>
-          <Patch Number="2" Name="Patch 2" ProgramChange="1"/>
-          <Patch Number="3" Name="Patch 3" ProgramChange="2"/>
-          <Patch Number="4" Name="Patch 4" ProgramChange="3"/>
-          <Patch Number="5" Name="Patch 5" ProgramChange="4"/>
-          <Patch Number="6" Name="Patch 6" ProgramChange="5"/>
-          <Patch Number="7" Name="Patch 7" ProgramChange="6"/>
-          <Patch Number="8" Name="Patch 8" ProgramChange="7"/>
-          <Patch Number="9" Name="Patch 9" ProgramChange="8"/>
-          <Patch Number="10" Name="Patch 10" ProgramChange="9"/>
-          <Patch Number="11" Name="Patch 11" ProgramChange="10"/>
-          <Patch Number="12" Name="Patch 12" ProgramChange="11"/>
-          <Patch Number="13" Name="Patch 13" ProgramChange="12"/>
-          <Patch Number="14" Name="Patch 14" ProgramChange="13"/>
-          <Patch Number="15" Name="Patch 15" ProgramChange="14"/>
-          <Patch Number="16" Name="Patch 16" ProgramChange="15"/>
-          <Patch Number="17" Name="Patch 17" ProgramChange="16"/>
-          <Patch Number="18" Name="Patch 18" ProgramChange="17"/>
-          <Patch Number="19" Name="Patch 19" ProgramChange="18"/>
-          <Patch Number="20" Name="Patch 20" ProgramChange="19"/>
-          <Patch Number="21" Name="Patch 21" ProgramChange="20"/>
-          <Patch Number="22" Name="Patch 22" ProgramChange="21"/>
-          <Patch Number="23" Name="Patch 23" ProgramChange="22"/>
-          <Patch Number="24" Name="Patch 24" ProgramChange="23"/>
-          <Patch Number="25" Name="Patch 25" ProgramChange="24"/>
-          <Patch Number="26" Name="Patch 26" ProgramChange="25"/>
-          <Patch Number="27" Name="Patch 27" ProgramChange="26"/>
-          <Patch Number="28" Name="Patch 28" ProgramChange="27"/>
-          <Patch Number="29" Name="Patch 29" ProgramChange="28"/>
-          <Patch Number="30" Name="Patch 30" ProgramChange="29"/>
-          <Patch Number="31" Name="Patch 31" ProgramChange="30"/>
-          <Patch Number="32" Name="Patch 32" ProgramChange="31"/>
-          <Patch Number="33" Name="Patch 33" ProgramChange="32"/>
-          <Patch Number="34" Name="Patch 34" ProgramChange="33"/>
-          <Patch Number="35" Name="Patch 35" ProgramChange="34"/>
-          <Patch Number="36" Name="Patch 36" ProgramChange="35"/>
-          <Patch Number="37" Name="Patch 37" ProgramChange="36"/>
-          <Patch Number="38" Name="Patch 38" ProgramChange="37"/>
-          <Patch Number="39" Name="Patch 39" ProgramChange="38"/>
-          <Patch Number="40" Name="Patch 40" ProgramChange="39"/>
-          <Patch Number="41" Name="Patch 41" ProgramChange="40"/>
-          <Patch Number="42" Name="Patch 42" ProgramChange="41"/>
-          <Patch Number="43" Name="Patch 43" ProgramChange="42"/>
-          <Patch Number="44" Name="Patch 44" ProgramChange="43"/>
-          <Patch Number="45" Name="Patch 45" ProgramChange="44"/>
-          <Patch Number="46" Name="Patch 46" ProgramChange="45"/>
-          <Patch Number="47" Name="Patch 47" ProgramChange="46"/>
-          <Patch Number="48" Name="Patch 48" ProgramChange="47"/>
-          <Patch Number="49" Name="Patch 49" ProgramChange="48"/>
-          <Patch Number="50" Name="Patch 50" ProgramChange="49"/>
-          <Patch Number="51" Name="Patch 51" ProgramChange="50"/>
-          <Patch Number="52" Name="Patch 52" ProgramChange="51"/>
-          <Patch Number="53" Name="Patch 53" ProgramChange="52"/>
-          <Patch Number="54" Name="Patch 54" ProgramChange="53"/>
-          <Patch Number="55" Name="Patch 55" ProgramChange="54"/>
-          <Patch Number="56" Name="Patch 56" ProgramChange="55"/>
-          <Patch Number="57" Name="Patch 57" ProgramChange="56"/>
-          <Patch Number="58" Name="Patch 58" ProgramChange="57"/>
-          <Patch Number="59" Name="Patch 59" ProgramChange="58"/>
-          <Patch Number="60" Name="Patch 60" ProgramChange="59"/>
-          <Patch Number="61" Name="Patch 61" ProgramChange="60"/>
-          <Patch Number="62" Name="Patch 62" ProgramChange="61"/>
-          <Patch Number="63" Name="Patch 63" ProgramChange="62"/>
-          <Patch Number="64" Name="Patch 64" ProgramChange="63"/>
-          <Patch Number="65" Name="Patch 65" ProgramChange="64"/>
-          <Patch Number="66" Name="Patch 66" ProgramChange="65"/>
-          <Patch Number="67" Name="Patch 67" ProgramChange="66"/>
-          <Patch Number="68" Name="Patch 68" ProgramChange="67"/>
-          <Patch Number="69" Name="Patch 69" ProgramChange="68"/>
-          <Patch Number="70" Name="Patch 70" ProgramChange="69"/>
-          <Patch Number="71" Name="Patch 71" ProgramChange="70"/>
-          <Patch Number="72" Name="Patch 72" ProgramChange="71"/>
-          <Patch Number="73" Name="Patch 73" ProgramChange="72"/>
-          <Patch Number="74" Name="Patch 74" ProgramChange="73"/>
-          <Patch Number="75" Name="Patch 75" ProgramChange="74"/>
-          <Patch Number="76" Name="Patch 76" ProgramChange="75"/>
-          <Patch Number="77" Name="Patch 77" ProgramChange="76"/>
-          <Patch Number="78" Name="Patch 78" ProgramChange="77"/>
-          <Patch Number="79" Name="Patch 79" ProgramChange="78"/>
-          <Patch Number="80" Name="Patch 80" ProgramChange="79"/>
-          <Patch Number="81" Name="Patch 81" ProgramChange="80"/>
-          <Patch Number="82" Name="Patch 82" ProgramChange="81"/>
-          <Patch Number="83" Name="Patch 83" ProgramChange="82"/>
-          <Patch Number="84" Name="Patch 84" ProgramChange="83"/>
-          <Patch Number="85" Name="Patch 85" ProgramChange="84"/>
-          <Patch Number="86" Name="Patch 86" ProgramChange="85"/>
-          <Patch Number="87" Name="Patch 87" ProgramChange="86"/>
-          <Patch Number="88" Name="Patch 88" ProgramChange="87"/>
-          <Patch Number="89" Name="Patch 89" ProgramChange="88"/>
-          <Patch Number="90" Name="Patch 90" ProgramChange="89"/>
-          <Patch Number="91" Name="Patch 91" ProgramChange="90"/>
-          <Patch Number="92" Name="Patch 92" ProgramChange="91"/>
-          <Patch Number="93" Name="Patch 93" ProgramChange="92"/>
-          <Patch Number="94" Name="Patch 94" ProgramChange="93"/>
-          <Patch Number="95" Name="Patch 95" ProgramChange="94"/>
-          <Patch Number="96" Name="Patch 96" ProgramChange="95"/>
-          <Patch Number="97" Name="Patch 97" ProgramChange="96"/>
-          <Patch Number="98" Name="Patch 98" ProgramChange="97"/>
-          <Patch Number="99" Name="Patch 99" ProgramChange="98"/>
-          <Patch Number="100" Name="Patch 100" ProgramChange="99"/>
-        </PatchNameList>
+      <UsesControlNameList Name="Controls"/>
+      <PatchBank Name="User Patches">
+        <UsesPatchNameList Name="User Patch Names"/>
       </PatchBank>
     </ChannelNameSet>
-    <ControlNameList Name="Modulation">
+    <PatchNameList Name="User Patch Names">
+      <Patch Number="1" Name="Patch 1" ProgramChange="0"/>
+      <Patch Number="2" Name="Patch 2" ProgramChange="1"/>
+      <Patch Number="3" Name="Patch 3" ProgramChange="2"/>
+      <Patch Number="4" Name="Patch 4" ProgramChange="3"/>
+      <Patch Number="5" Name="Patch 5" ProgramChange="4"/>
+      <Patch Number="6" Name="Patch 6" ProgramChange="5"/>
+      <Patch Number="7" Name="Patch 7" ProgramChange="6"/>
+      <Patch Number="8" Name="Patch 8" ProgramChange="7"/>
+      <Patch Number="9" Name="Patch 9" ProgramChange="8"/>
+      <Patch Number="10" Name="Patch 10" ProgramChange="9"/>
+      <Patch Number="11" Name="Patch 11" ProgramChange="10"/>
+      <Patch Number="12" Name="Patch 12" ProgramChange="11"/>
+      <Patch Number="13" Name="Patch 13" ProgramChange="12"/>
+      <Patch Number="14" Name="Patch 14" ProgramChange="13"/>
+      <Patch Number="15" Name="Patch 15" ProgramChange="14"/>
+      <Patch Number="16" Name="Patch 16" ProgramChange="15"/>
+      <Patch Number="17" Name="Patch 17" ProgramChange="16"/>
+      <Patch Number="18" Name="Patch 18" ProgramChange="17"/>
+      <Patch Number="19" Name="Patch 19" ProgramChange="18"/>
+      <Patch Number="20" Name="Patch 20" ProgramChange="19"/>
+      <Patch Number="21" Name="Patch 21" ProgramChange="20"/>
+      <Patch Number="22" Name="Patch 22" ProgramChange="21"/>
+      <Patch Number="23" Name="Patch 23" ProgramChange="22"/>
+      <Patch Number="24" Name="Patch 24" ProgramChange="23"/>
+      <Patch Number="25" Name="Patch 25" ProgramChange="24"/>
+      <Patch Number="26" Name="Patch 26" ProgramChange="25"/>
+      <Patch Number="27" Name="Patch 27" ProgramChange="26"/>
+      <Patch Number="28" Name="Patch 28" ProgramChange="27"/>
+      <Patch Number="29" Name="Patch 29" ProgramChange="28"/>
+      <Patch Number="30" Name="Patch 30" ProgramChange="29"/>
+      <Patch Number="31" Name="Patch 31" ProgramChange="30"/>
+      <Patch Number="32" Name="Patch 32" ProgramChange="31"/>
+      <Patch Number="33" Name="Patch 33" ProgramChange="32"/>
+      <Patch Number="34" Name="Patch 34" ProgramChange="33"/>
+      <Patch Number="35" Name="Patch 35" ProgramChange="34"/>
+      <Patch Number="36" Name="Patch 36" ProgramChange="35"/>
+      <Patch Number="37" Name="Patch 37" ProgramChange="36"/>
+      <Patch Number="38" Name="Patch 38" ProgramChange="37"/>
+      <Patch Number="39" Name="Patch 39" ProgramChange="38"/>
+      <Patch Number="40" Name="Patch 40" ProgramChange="39"/>
+      <Patch Number="41" Name="Patch 41" ProgramChange="40"/>
+      <Patch Number="42" Name="Patch 42" ProgramChange="41"/>
+      <Patch Number="43" Name="Patch 43" ProgramChange="42"/>
+      <Patch Number="44" Name="Patch 44" ProgramChange="43"/>
+      <Patch Number="45" Name="Patch 45" ProgramChange="44"/>
+      <Patch Number="46" Name="Patch 46" ProgramChange="45"/>
+      <Patch Number="47" Name="Patch 47" ProgramChange="46"/>
+      <Patch Number="48" Name="Patch 48" ProgramChange="47"/>
+      <Patch Number="49" Name="Patch 49" ProgramChange="48"/>
+      <Patch Number="50" Name="Patch 50" ProgramChange="49"/>
+      <Patch Number="51" Name="Patch 51" ProgramChange="50"/>
+      <Patch Number="52" Name="Patch 52" ProgramChange="51"/>
+      <Patch Number="53" Name="Patch 53" ProgramChange="52"/>
+      <Patch Number="54" Name="Patch 54" ProgramChange="53"/>
+      <Patch Number="55" Name="Patch 55" ProgramChange="54"/>
+      <Patch Number="56" Name="Patch 56" ProgramChange="55"/>
+      <Patch Number="57" Name="Patch 57" ProgramChange="56"/>
+      <Patch Number="58" Name="Patch 58" ProgramChange="57"/>
+      <Patch Number="59" Name="Patch 59" ProgramChange="58"/>
+      <Patch Number="60" Name="Patch 60" ProgramChange="59"/>
+      <Patch Number="61" Name="Patch 61" ProgramChange="60"/>
+      <Patch Number="62" Name="Patch 62" ProgramChange="61"/>
+      <Patch Number="63" Name="Patch 63" ProgramChange="62"/>
+      <Patch Number="64" Name="Patch 64" ProgramChange="63"/>
+      <Patch Number="65" Name="Patch 65" ProgramChange="64"/>
+      <Patch Number="66" Name="Patch 66" ProgramChange="65"/>
+      <Patch Number="67" Name="Patch 67" ProgramChange="66"/>
+      <Patch Number="68" Name="Patch 68" ProgramChange="67"/>
+      <Patch Number="69" Name="Patch 69" ProgramChange="68"/>
+      <Patch Number="70" Name="Patch 70" ProgramChange="69"/>
+      <Patch Number="71" Name="Patch 71" ProgramChange="70"/>
+      <Patch Number="72" Name="Patch 72" ProgramChange="71"/>
+      <Patch Number="73" Name="Patch 73" ProgramChange="72"/>
+      <Patch Number="74" Name="Patch 74" ProgramChange="73"/>
+      <Patch Number="75" Name="Patch 75" ProgramChange="74"/>
+      <Patch Number="76" Name="Patch 76" ProgramChange="75"/>
+      <Patch Number="77" Name="Patch 77" ProgramChange="76"/>
+      <Patch Number="78" Name="Patch 78" ProgramChange="77"/>
+      <Patch Number="79" Name="Patch 79" ProgramChange="78"/>
+      <Patch Number="80" Name="Patch 80" ProgramChange="79"/>
+      <Patch Number="81" Name="Patch 81" ProgramChange="80"/>
+      <Patch Number="82" Name="Patch 82" ProgramChange="81"/>
+      <Patch Number="83" Name="Patch 83" ProgramChange="82"/>
+      <Patch Number="84" Name="Patch 84" ProgramChange="83"/>
+      <Patch Number="85" Name="Patch 85" ProgramChange="84"/>
+      <Patch Number="86" Name="Patch 86" ProgramChange="85"/>
+      <Patch Number="87" Name="Patch 87" ProgramChange="86"/>
+      <Patch Number="88" Name="Patch 88" ProgramChange="87"/>
+      <Patch Number="89" Name="Patch 89" ProgramChange="88"/>
+      <Patch Number="90" Name="Patch 90" ProgramChange="89"/>
+      <Patch Number="91" Name="Patch 91" ProgramChange="90"/>
+      <Patch Number="92" Name="Patch 92" ProgramChange="91"/>
+      <Patch Number="93" Name="Patch 93" ProgramChange="92"/>
+      <Patch Number="94" Name="Patch 94" ProgramChange="93"/>
+      <Patch Number="95" Name="Patch 95" ProgramChange="94"/>
+      <Patch Number="96" Name="Patch 96" ProgramChange="95"/>
+      <Patch Number="97" Name="Patch 97" ProgramChange="96"/>
+      <Patch Number="98" Name="Patch 98" ProgramChange="97"/>
+      <Patch Number="99" Name="Patch 99" ProgramChange="98"/>
+      <Patch Number="100" Name="Patch 100" ProgramChange="99"/>
+    </PatchNameList>
+    <ControlNameList Name="Controls">
+      <!-- Modulation -->
       <Control Type="7bit" Number="3" Name="LFO Rate (Coarse)"/>
       <Control Type="7bit" Number="35" Name="LFO Rate (Fine)"/>
       <Control Type="7bit" Number="13" Name="LFO VCO Amount (Coarse)"/>
@@ -130,8 +132,7 @@
       <Control Type="7bit" Number="87" Name="LFO MIDI Sync"/>
       <Control Type="7bit" Number="86" Name="LFO Sync Clock Div"/>
       <Control Type="7bit" Number="82" Name="LFO Key Trigger"/>
-    </ControlNameList>
-    <ControlNameList Name="Oscillators">
+      <!-- Oscillators -->
       <Control Type="7bit" Number="70" Name="VCO 1 Wave"/>
       <Control Type="7bit" Number="71" Name="VCO 2 Wave"/>
       <Control Type="7bit" Number="17" Name="VCO 2 Freq (Coarse)"/>
@@ -143,16 +144,14 @@
       <Control Type="7bit" Number="65" Name="Glide Switch"/>
       <Control Type="7bit" Number="92" Name="Glide Type"/>
       <Control Type="7bit" Number="83" Name="Legato Glide"/>
-    </ControlNameList>
-    <ControlNameList Name="Mixer">
+      <!-- Mixer -->
       <Control Type="7bit" Number="15" Name="VCO 1 (Coarse)"/>
       <Control Type="7bit" Number="47" Name="VCO 1 (Fine)"/>
       <Control Type="7bit" Number="16" Name="VCO 2 (Coarse)"/>
       <Control Type="7bit" Number="48" Name="VCO 2 (Fine)"/>
       <Control Type="7bit" Number="27" Name="External In (Coarse)"/>
       <Control Type="7bit" Number="59" Name="External In (Fine)"/>
-    </ControlNameList>
-    <ControlNameList Name="Filter">
+      <!-- Filter -->
       <Control Type="7bit" Number="19" Name="Cutoff (Coarse)"/>
       <Control Type="7bit" Number="51" Name="Cutoff (Fine)"/>
       <Control Type="7bit" Number="19" Name="Resonance (Coarse)"/>
@@ -162,8 +161,7 @@
       <Control Type="7bit" Number="20" Name="KB Track (Coarse)"/>
       <Control Type="7bit" Number="54" Name="KB Track (Fine)"/>
       <Control Type="7bit" Number="89" Name="Filter Velocity Sensitivity"/>
-    </ControlNameList>
-    <ControlNameList Name="Envelopes">
+      <!-- Envelopes -->
       <Control Type="7bit" Number="23" Name="VCF Attack (Coarse)"/>
       <Control Type="7bit" Number="55" Name="VCF Attack (Fine)"/>
       <Control Type="7bit" Number="24" Name="VCF Decay/Release (Coarse)"/>
@@ -178,24 +176,19 @@
       <Control Type="7bit" Number="62" Name="VCA Sustain (Fine)"/>
       <Control Type="7bit" Number="72" Name="Release Switch"/>
       <Control Type="7bit" Number="73" Name="Trigger Mode"/>
-    </ControlNameList>
-    <ControlNameList Name="Volume">
+      <!-- Volume -->
       <Control Type="7bit" Number="7" Name="Volume (Coarse)"/>
       <Control Type="7bit" Number="39" Name="Volume (Fine)"/>
       <Control Type="7bit" Number="90" Name="Volume Velocity Sensitivity"/>
-    </ControlNameList>
-    <ControlNameList Name="Keyboard Response">
+      <!-- Keyboard Response -->
       <Control Type="7bit" Number="91" Name="Key Priority"/>
-    </ControlNameList>
-    <ControlNameList Name="Mod Wheel Response">
+      <!-- Mod Wheel Response -->
       <Control Type="7bit" Number="1" Name="Mod Wheel (Coarse)"/>
       <Control Type="7bit" Number="33" Name="Mod Wheel (Fine)"/>
-    </ControlNameList>
-    <ControlNameList Name="Pitch Wheel Response">
+      <!-- Pitch Wheel Response -->
       <Control Type="7bit" Number="107" Name="Bend Up Amount"/>
       <Control Type="7bit" Number="108" Name="Bend Down Amount"/>
-    </ControlNameList>
-    <ControlNameList Name="Control">
+      <!-- Control -->
       <Control Type="7bit" Number="122" Name="Local Control Off"/>
       <Control Type="7bit" Number="122" Name="All Sounds Off"/>
       <Control Type="7bit" Number="123" Name="All Notes Off"/>