diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index d8fdd51dd..0cb78f05e 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -2814,27 +2814,25 @@ export const scrub = register(
 );
 
 const subControlAliases = new Map();
-const registerSubControl = (funcName, main, ...aliases) => {
-  const lowerFunc = String(funcName).toLowerCase();
-  const aliasMap = subControlAliases.get(lowerFunc) ?? new Map();
-  const allKeys = new Set([main, ...aliases]);
+const registerSubControl = (control, subControl, ...aliases) => {
+  const aliasMap = subControlAliases.get(control) ?? new Map();
+  const allKeys = new Set([subControl, ...aliases]);
   for (const alias of allKeys) {
-    aliasMap.set(String(alias).toLowerCase(), main);
+    aliasMap.set(String(alias).toLowerCase(), subControl);
   }
-  subControlAliases.set(lowerFunc, aliasMap);
+  subControlAliases.set(control, aliasMap);
 };
 
-const registerSubControls = (funcName, aliasGroups = []) => {
-  for (const [main, ...aliases] of aliasGroups) {
-    registerSubControl(funcName, main, ...aliases);
+const registerSubControls = (control, subControlAliases = []) => {
+  for (const [subControl, ...aliases] of subControlAliases) {
+    registerSubControl(control, subControl, ...aliases);
   }
 };
 
-const resolveConfigKey = (funcName, key) => {
-  const aliasMap = subControlAliases.get(String(funcName).toLowerCase());
-  if (!aliasMap) return key;
-  const normalized = String(key).toLowerCase();
-  return aliasMap.get(normalized) ?? key;
+const getMainSubcontrolName = (control, subKey) => {
+  const aliasMap = subControlAliases.get(control);
+  if (!aliasMap) return subKey;
+  return aliasMap.get(String(subKey).toLowerCase()) ?? subKey;
 };
 
 registerSubControls('lfo', [
@@ -2884,7 +2882,7 @@ Pattern.prototype.modulate = function (type, config, idx) {
   let defaultValue = {};
   let defaultSet = 'control' in config;
   for (const [rawKey, value] of Object.entries(config)) {
-    const key = resolveConfigKey(type, rawKey);
+    const key = getMainSubcontrolName(type, rawKey);
     const valuePat = reify(value);
     output = output
       .fmap((v) => (c) => {
diff --git a/packages/superdough/superdoughdata.mjs b/packages/superdough/superdoughdata.mjs
index a273021d0..d3b3d40b5 100644
--- a/packages/superdough/superdoughdata.mjs
+++ b/packages/superdough/superdoughdata.mjs
@@ -4,6 +4,7 @@ Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Mapping from control name to webaudio node and parameter
 const CONTROL_TARGETS = {
   stretch: { node: 'stretch', param: 'pitchFactor' },
   gain: { node: 'gain', param: 'gain' },