DN-MC6000MK2: Consistent naming of callback functions

1 files changed, 290 insertions, 210 deletions

diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml
index 4fa280b69c..56eee358aa 100644
--- a/res/controllers/Denon-MC6000MK2.midi.xml
+++ b/res/controllers/Denon-MC6000MK2.midi.xml
@@ -15,7 +15,71 @@
 			<control>
 				<midino>0x45</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.onXfaderContour</key>
+				<key>DenonMC6000MK2.recvXfaderContourKnob</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x64</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.recvPanelButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x64</midino>
+				<status>0x90</status>
+				<key>DenonMC6000MK2.recvPanelButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x65</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.recvListButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x65</midino>
+				<status>0x90</status>
+				<key>DenonMC6000MK2.recvListButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x4C</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.recvViewButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x4C</midino>
+				<status>0x90</status>
+				<key>DenonMC6000MK2.recvViewButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x4D</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.recvAreaButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x4D</midino>
+				<status>0x90</status>
+				<key>DenonMC6000MK2.recvAreaButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -23,8 +87,16 @@
 			<!-- left filter efx (deck 1+3) -->
 			<control>
 				<midino>0x16</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.leftSide.recvFilterButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x16</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onFilterButton</key>
+				<key>DenonMC6000MK2.leftSide.recvFilterButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -32,7 +104,7 @@
 			<control>
 				<midino>0x66</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.leftSide.onFilterParam</key>
+				<key>DenonMC6000MK2.leftSide.recvFilterKnob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -40,8 +112,16 @@
 			<!-- right filter efx (deck 2+4) -->
 			<control>
 				<midino>0x1E</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.rightSide.recvFilterButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<midino>0x1E</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onFilterButton</key>
+				<key>DenonMC6000MK2.rightSide.recvFilterButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -49,7 +129,7 @@
 			<control>
 				<midino>0x67</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.rightSide.onFilterParam</key>
+				<key>DenonMC6000MK2.rightSide.recvFilterKnob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -58,7 +138,7 @@
 			<control>
 				<midino>0x15</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.leftSide.onEfx1Button</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust1Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -66,7 +146,7 @@
 			<control>
 				<midino>0x15</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfx1Button</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust1Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -74,7 +154,7 @@
 			<control>
 				<midino>0x55</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.leftSide.onEfx1Param</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust1Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -82,7 +162,7 @@
 			<control>
 				<midino>0x12</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.leftSide.onEfx2Button</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust2Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -90,7 +170,7 @@
 			<control>
 				<midino>0x12</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfx2Button</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust2Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -98,7 +178,7 @@
 			<control>
 				<midino>0x56</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.leftSide.onEfx2Param</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust2Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -106,7 +186,7 @@
 			<control>
 				<midino>0x13</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfx3Button</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust3Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -114,7 +194,7 @@
 			<control>
 				<midino>0x57</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.leftSide.onEfx3Param</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvAdjust3Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -122,7 +202,7 @@
 			<control>
 				<midino>0x58</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.leftSide.onEfxBeatsKnob</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvBeatsKnob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -130,7 +210,7 @@
 			<control>
 				<midino>0x40</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfxBeatsButton</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvBeatsButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -138,7 +218,7 @@
 			<control>
 				<midino>0x46</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfxTapButton</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvTapButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -147,7 +227,7 @@
 			<control>
 				<midino>0x55</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfx1Button</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust1Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -155,7 +235,7 @@
 			<control>
 				<midino>0x59</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.rightSide.onEfx1Param</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust1Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -163,7 +243,7 @@
 			<control>
 				<midino>0x52</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfx2Button</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust2Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -171,7 +251,7 @@
 			<control>
 				<midino>0x5A</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.rightSide.onEfx2Param</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust2Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -179,7 +259,7 @@
 			<control>
 				<midino>0x53</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfx3Button</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust3Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -187,7 +267,7 @@
 			<control>
 				<midino>0x5B</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.rightSide.onEfx3Param</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvAdjust3Knob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -195,7 +275,7 @@
 			<control>
 				<midino>0x5C</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.rightSide.onEfxBeatsKnob</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvBeatsKnob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -203,7 +283,7 @@
 			<control>
 				<midino>0x41</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfxBeatsButton</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvBeatsButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -211,7 +291,7 @@
 			<control>
 				<midino>0x47</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfxTapButton</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvTapButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -221,7 +301,7 @@
 			<control>
 				<midino>0x54</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.onTrackSelectKnob</key>
+				<key>DenonMC6000MK2.recvTrackSelectKnob</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -284,7 +364,7 @@
 				<group>[Sampler1]</group>
 				<midino>0x21</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -293,7 +373,7 @@
 				<group>[Sampler1]</group>
 				<midino>0x21</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -302,7 +382,7 @@
 				<group>[Sampler2]</group>
 				<midino>0x22</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -311,7 +391,7 @@
 				<group>[Sampler2]</group>
 				<midino>0x22</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -320,7 +400,7 @@
 				<group>[Sampler3]</group>
 				<midino>0x23</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -329,7 +409,7 @@
 				<group>[Sampler3]</group>
 				<midino>0x23</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -338,7 +418,7 @@
 				<group>[Sampler4]</group>
 				<midino>0x24</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -347,7 +427,7 @@
 				<group>[Sampler4]</group>
 				<midino>0x24</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -358,7 +438,7 @@
 				<group>[Sampler5]</group>
 				<midino>0x21</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -367,7 +447,7 @@
 				<group>[Sampler5]</group>
 				<midino>0x21</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -376,7 +456,7 @@
 				<group>[Sampler6]</group>
 				<midino>0x22</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -385,7 +465,7 @@
 				<group>[Sampler6]</group>
 				<midino>0x22</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -394,7 +474,7 @@
 				<group>[Sampler7]</group>
 				<midino>0x23</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -403,7 +483,7 @@
 				<group>[Sampler7]</group>
 				<midino>0x23</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -412,7 +492,7 @@
 				<group>[Sampler8]</group>
 				<midino>0x24</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -421,7 +501,7 @@
 				<group>[Sampler8]</group>
 				<midino>0x24</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onSamplerButton</key>
+				<key>DenonMC6000MK2.recvSamplerButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -432,7 +512,7 @@
 				<group>[Channel1]</group>
 				<midino>0x01</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onCueMixButton</key>
+				<key>DenonMC6000MK2.recvCueMixButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -471,7 +551,7 @@
 				<group>[Channel1]</group>
 				<midino>0x58</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfxDeckButton</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -480,7 +560,7 @@
 				<group>[Channel1]</group>
 				<midino>0x5C</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfxDeckButton</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -489,7 +569,7 @@
 				<group>[Channel1]</group>
 				<midino>0x31</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignLeftButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignLeftButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -498,7 +578,7 @@
 				<group>[Channel1]</group>
 				<midino>0x32</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignThruButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignThruButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -507,7 +587,7 @@
 				<group>[Channel1]</group>
 				<midino>0x33</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignRightButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignRightButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -518,7 +598,7 @@
 				<group>[Channel1]</group>
 				<midino>0x03</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onDeckButton</key>
+				<key>DenonMC6000MK2.leftSide.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -527,7 +607,7 @@
 				<group>[Channel1]</group>
 				<midino>0x04</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onVinylButton</key>
+				<key>DenonMC6000MK2.recvVinylButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -536,7 +616,7 @@
 				<group>[Channel1]</group>
 				<midino>0x06</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onKeyLockButton</key>
+				<key>DenonMC6000MK2.recvKeyLockButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -545,7 +625,7 @@
 				<group>[Channel1]</group>
 				<midino>0x42</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onCueButton</key>
+				<key>DenonMC6000MK2.recvCueButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -554,7 +634,7 @@
 				<group>[Channel1]</group>
 				<midino>0x42</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onCueButton</key>
+				<key>DenonMC6000MK2.recvCueButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -563,7 +643,7 @@
 				<group>[Channel1]</group>
 				<midino>0x43</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onPlayButton</key>
+				<key>DenonMC6000MK2.recvPlayButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -572,7 +652,7 @@
 				<group>[Channel1]</group>
 				<midino>0x0C</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onBendPlusButton</key>
+				<key>DenonMC6000MK2.recvBendPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -581,7 +661,7 @@
 				<group>[Channel1]</group>
 				<midino>0x0C</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onBendPlusButton</key>
+				<key>DenonMC6000MK2.recvBendPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -590,7 +670,7 @@
 				<group>[Channel1]</group>
 				<midino>0x0D</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onBendMinusButton</key>
+				<key>DenonMC6000MK2.recvBendMinusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -599,7 +679,7 @@
 				<group>[Channel1]</group>
 				<midino>0x0D</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onBendMinusButton</key>
+				<key>DenonMC6000MK2.recvBendMinusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -625,7 +705,7 @@
 				<group>[Channel1]</group>
 				<midino>0x56</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onJogTouch</key>
+				<key>DenonMC6000MK2.recvJogTouch</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -634,7 +714,7 @@
 				<group>[Channel1]</group>
 				<midino>0x56</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onJogTouch</key>
+				<key>DenonMC6000MK2.recvJogTouch</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -643,7 +723,7 @@
 				<group>[Channel1]</group>
 				<midino>0x51</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onJogTouchVinyl</key>
+				<key>DenonMC6000MK2.recvJogTouchVinyl</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -652,7 +732,7 @@
 				<group>[Channel1]</group>
 				<midino>0x51</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onJogTouchVinyl</key>
+				<key>DenonMC6000MK2.recvJogTouchVinyl</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -661,7 +741,7 @@
 				<group>[Channel1]</group>
 				<midino>0x52</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.onJogSpin</key>
+				<key>DenonMC6000MK2.recvJogSpin</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -670,7 +750,7 @@
 				<group>[Channel1]</group>
 				<midino>0x51</midino>
 				<status>0xB0</status>
-				<key>DenonMC6000MK2.onJogSpinVinyl</key>
+				<key>DenonMC6000MK2.recvJogSpinVinyl</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -679,7 +759,7 @@
 				<group>[Channel1]</group>
 				<midino>0x17</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onHotcue1Button</key>
+				<key>DenonMC6000MK2.recvHotcue1Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -688,7 +768,7 @@
 				<group>[Channel1]</group>
 				<midino>0x17</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onHotcue1Button</key>
+				<key>DenonMC6000MK2.recvHotcue1Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -697,7 +777,7 @@
 				<group>[Channel1]</group>
 				<midino>0x18</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onHotcue2Button</key>
+				<key>DenonMC6000MK2.recvHotcue2Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -706,7 +786,7 @@
 				<group>[Channel1]</group>
 				<midino>0x18</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onHotcue2Button</key>
+				<key>DenonMC6000MK2.recvHotcue2Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -715,7 +795,7 @@
 				<group>[Channel1]</group>
 				<midino>0x19</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onHotcue3Button</key>
+				<key>DenonMC6000MK2.recvHotcue3Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -724,7 +804,7 @@
 				<group>[Channel1]</group>
 				<midino>0x19</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onHotcue3Button</key>
+				<key>DenonMC6000MK2.recvHotcue3Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -733,7 +813,7 @@
 				<group>[Channel1]</group>
 				<midino>0x20</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onHotcue4Button</key>
+				<key>DenonMC6000MK2.recvHotcue4Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -742,7 +822,7 @@
 				<group>[Channel1]</group>
 				<midino>0x20</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onHotcue4Button</key>
+				<key>DenonMC6000MK2.recvHotcue4Button</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -751,7 +831,7 @@
 				<group>[Channel1]</group>
 				<midino>0x1D</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onAutoLoopButton</key>
+				<key>DenonMC6000MK2.recvAutoLoopButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -760,7 +840,7 @@
 				<group>[Channel1]</group>
 				<midino>0x37</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onLoopInButton</key>
+				<key>DenonMC6000MK2.recvLoopInButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -769,7 +849,7 @@
 				<group>[Channel1]</group>
 				<midino>0x39</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onLoopOutButton</key>
+				<key>DenonMC6000MK2.recvLoopOutButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -778,7 +858,7 @@
 				<group>[Channel1]</group>
 				<midino>0x69</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<key>DenonMC6000MK2.recvLoopCutMinusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -787,7 +867,7 @@
 				<group>[Channel1]</group>
 				<midino>0x69</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<key>DenonMC6000MK2.recvLoopCutMinusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -796,7 +876,7 @@
 				<group>[Channel1]</group>
 				<midino>0x6A</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<key>DenonMC6000MK2.recvLoopCutPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -805,7 +885,7 @@
 				<group>[Channel1]</group>
 				<midino>0x6A</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<key>DenonMC6000MK2.recvLoopCutPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -814,7 +894,7 @@
 				<group>[Channel1]</group>
 				<midino>0x62</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onLoadButton</key>
+				<key>DenonMC6000MK2.recvLoadButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -823,7 +903,7 @@
 				<group>[Channel1]</group>
 				<midino>0x60</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onShiftButton</key>
+				<key>DenonMC6000MK2.recvShiftButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -832,7 +912,7 @@
 				<group>[Channel1]</group>
 				<midino>0x60</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onShiftButton</key>
+				<key>DenonMC6000MK2.recvShiftButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -841,7 +921,7 @@
 				<group>[Channel1]</group>
 				<midino>0x50</midino>
 				<status>0x80</status>
-				<key>DenonMC6000MK2.onCensorButton</key>
+				<key>DenonMC6000MK2.recvCensorButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -850,7 +930,7 @@
 				<group>[Channel1]</group>
 				<midino>0x50</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onCensorButton</key>
+				<key>DenonMC6000MK2.recvCensorButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -861,7 +941,7 @@
 				<group>[Channel2]</group>
 				<midino>0x02</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onCueMixButton</key>
+				<key>DenonMC6000MK2.recvCueMixButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -900,7 +980,7 @@
 				<group>[Channel2]</group>
 				<midino>0x59</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.leftSide.onEfxDeckButton</key>
+				<key>DenonMC6000MK2.leftSide.efxUnit.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -909,7 +989,7 @@
 				<group>[Channel2]</group>
 				<midino>0x5D</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.rightSide.onEfxDeckButton</key>
+				<key>DenonMC6000MK2.rightSide.efxUnit.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -918,7 +998,7 @@
 				<group>[Channel2]</group>
 				<midino>0x34</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignLeftButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignLeftButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -927,7 +1007,7 @@
 				<group>[Channel2]</group>
 				<midino>0x35</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignThruButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignThruButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -936,7 +1016,7 @@
 				<group>[Channel2]</group>
 				<midino>0x36</midino>
 				<status>0x90</status>
-				<key>DenonMC6000MK2.onXfaderAssignRightButton</key>
+				<key>DenonMC6000MK2.recvXfaderAssignRightButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -947,7 +1027,7 @@
 				<group>[Channel2]</group>
 				<midino>0x08</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.rightSide.onDeckButton</key>
+				<key>DenonMC6000MK2.rightSide.recvDeckButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -956,7 +1036,7 @@
 				<group>[Channel2]</group>
 				<midino>0x04</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onVinylButton</key>
+				<key>DenonMC6000MK2.recvVinylButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -965,7 +1045,7 @@
 				<group>[Channel2]</group>
 				<midino>0x06</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onKeyLockButton</key>
+				<key>DenonMC6000MK2.recvKeyLockButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -974,7 +1054,7 @@
 				<group>[Channel2]</group>
 				<midino>0x42</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onCueButton</key>
+				<key>DenonMC6000MK2.recvCueButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -983,7 +1063,7 @@
 				<group>[Channel2]</group>
 				<midino>0x42</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onCueButton</key>
+				<key>DenonMC6000MK2.recvCueButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -992,7 +1072,7 @@
 				<group>[Channel2]</group>
 				<midino>0x43</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onPlayButton</key>
+				<key>DenonMC6000MK2.recvPlayButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -1001,7 +1081,7 @@
 				<group>[Channel2]</group>
 				<midino>0x0C</midino>
 				<status>0x82</status>
-				<key>DenonMC6000MK2.onBendPlusButton</key>
+				<key>DenonMC6000MK2.recvBendPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -1010,7 +1090,7 @@
 				<group>[Channel2]</group>
 				<midino>0x0C</midino>
 				<status>0x92</status>
-				<key>DenonMC6000MK2.onBendPlusButton</key>
+				<key>DenonMC6000MK2.recvBendPlusButton</key>
 				<options>
 					<script-binding/>
 				</options>
@@ -1019,7 +1099,7 @@
 				<group>[Channel2]</group>
 				<midino>0x0D</midino>
 				<status>0x82</st