diff --git a/src/sfizz/OpcodeCleanup.cpp b/src/sfizz/OpcodeCleanup.cpp
index d5e41a63..9c895648 100644
--- a/src/sfizz/OpcodeCleanup.cpp
+++ b/src/sfizz/OpcodeCleanup.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.3 on Fri May 15 08:18:09 2020 */
+/* Generated by re2c 1.3 on Fri May 15 08:30:58 2020 */
 #line 1 "src/sfizz/OpcodeCleanup.re"
 /* -*- mode: c++; -*- */
 // SPDX-License-Identifier: BSD-2-Clause
@@ -10,6 +10,7 @@
 #include "Opcode.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/ascii.h"
 #include <string>
 
 namespace sfz {
@@ -18,7 +19,10 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc
 {
     std::string opcode { rawOpcode };
 
-    #line 23 "src/sfizz/OpcodeCleanup.re"
+    // always convert it to lower case
+    absl::AsciiStrToLower(&opcode);
+
+    #line 27 "src/sfizz/OpcodeCleanup.re"
 
     #define YYMAXNMATCH 4
 
@@ -36,7 +40,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc
         return absl::string_view(beg, end - beg);
     };
 
-    #line 44 "src/sfizz/OpcodeCleanup.re"
+    #line 48 "src/sfizz/OpcodeCleanup.re"
 
 
     //--------------------------------------------------------------------------
@@ -46,7 +50,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc
     YYCURSOR = opcode.c_str();
 
     
-#line 50 "src/sfizz/OpcodeCleanup.cpp"
+#line 54 "src/sfizz/OpcodeCleanup.cpp"
 {
 	char yych;
 	yych = *YYCURSOR;
@@ -62,11 +66,11 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc
 yy2:
 	++YYCURSOR;
 yy3:
-#line 59 "src/sfizz/OpcodeCleanup.re"
+#line 63 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_region_oncc;
     }
-#line 70 "src/sfizz/OpcodeCleanup.cpp"
+#line 74 "src/sfizz/OpcodeCleanup.cpp"
 yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 0x00) goto yy3;
@@ -150,14 +154,14 @@ yy15:
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = yyt2 - 3;
 	yypmatch[5] = YYCURSOR - 1;
-#line 54 "src/sfizz/OpcodeCleanup.re"
+#line 58 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "_oncc", group(2));
         goto end_region_oncc;
     }
-#line 159 "src/sfizz/OpcodeCleanup.cpp"
+#line 163 "src/sfizz/OpcodeCleanup.cpp"
 }
-#line 63 "src/sfizz/OpcodeCleanup.re"
+#line 67 "src/sfizz/OpcodeCleanup.re"
 
 
 end_region_oncc:
@@ -172,7 +176,7 @@ end_region_oncc:
     YYCURSOR = opcode.c_str();
 
     
-#line 176 "src/sfizz/OpcodeCleanup.cpp"
+#line 180 "src/sfizz/OpcodeCleanup.cpp"
 {
 	char yych;
 	yych = *YYCURSOR;
@@ -212,11 +216,11 @@ end_region_oncc:
 yy19:
 	++YYCURSOR;
 yy20:
-#line 162 "src/sfizz/OpcodeCleanup.re"
+#line 166 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_region;
     }
-#line 220 "src/sfizz/OpcodeCleanup.cpp"
+#line 224 "src/sfizz/OpcodeCleanup.cpp"
 yy21:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
@@ -756,12 +760,12 @@ yy96:
 	yypmatch[0] = yyt1 - 4;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 144 "src/sfizz/OpcodeCleanup.re"
+#line 148 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("fil1_", group(1));
         goto end_region;
     }
-#line 765 "src/sfizz/OpcodeCleanup.cpp"
+#line 769 "src/sfizz/OpcodeCleanup.cpp"
 yy98:
 	yych = *++YYCURSOR;
 yy99:
@@ -780,12 +784,12 @@ yy101:
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 126 "src/sfizz/OpcodeCleanup.re"
+#line 130 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("volume", group(1));
         goto end_region;
     }
-#line 789 "src/sfizz/OpcodeCleanup.cpp"
+#line 793 "src/sfizz/OpcodeCleanup.cpp"
 yy103:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
@@ -870,12 +874,12 @@ yy115:
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 130 "src/sfizz/OpcodeCleanup.re"
+#line 134 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("pitch", group(1));
         goto end_region;
     }
-#line 879 "src/sfizz/OpcodeCleanup.cpp"
+#line 883 "src/sfizz/OpcodeCleanup.cpp"
 yy117:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
@@ -1015,12 +1019,12 @@ yy137:
 	yypmatch[0] = yyt1 - 3;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 104 "src/sfizz/OpcodeCleanup.re"
+#line 108 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("off_", group(1));
         goto end_region;
     }
-#line 1024 "src/sfizz/OpcodeCleanup.cpp"
+#line 1028 "src/sfizz/OpcodeCleanup.cpp"
 yy139:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1106,12 +1110,12 @@ yy151:
 	yypmatch[0] = yyt1 - 4;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 108 "src/sfizz/OpcodeCleanup.re"
+#line 112 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("bend_", group(1));
         goto end_region;
     }
-#line 1115 "src/sfizz/OpcodeCleanup.cpp"
+#line 1119 "src/sfizz/OpcodeCleanup.cpp"
 yy153:
 	++YYCURSOR;
 	yynmatch = 2;
@@ -1119,12 +1123,12 @@ yy153:
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 148 "src/sfizz/OpcodeCleanup.re"
+#line 152 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("cutoff1", group(1));
         goto end_region;
     }
-#line 1128 "src/sfizz/OpcodeCleanup.cpp"
+#line 1132 "src/sfizz/OpcodeCleanup.cpp"
 yy155:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
@@ -1317,12 +1321,12 @@ yy184:
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 8;
 	yypmatch[1] = YYCURSOR;
-#line 112 "src/sfizz/OpcodeCleanup.re"
+#line 116 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("fil1_type");
         goto end_region;
     }
-#line 1326 "src/sfizz/OpcodeCleanup.cpp"
+#line 1330 "src/sfizz/OpcodeCleanup.cpp"
 yy186:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1371,12 +1375,12 @@ yy191:
 	yypmatch[0] = yyt1 - 4;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 100 "src/sfizz/OpcodeCleanup.re"
+#line 104 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("loop_", group(1));
         goto end_region;
     }
-#line 1380 "src/sfizz/OpcodeCleanup.cpp"
+#line 1384 "src/sfizz/OpcodeCleanup.cpp"
 yy193:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1494,12 +1498,12 @@ yy210:
 	yypmatch[0] = yyt1 - 3;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 5;
-#line 116 "src/sfizz/OpcodeCleanup.re"
+#line 120 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("fil", group(1), "_type");
         goto end_region;
     }
-#line 1503 "src/sfizz/OpcodeCleanup.cpp"
+#line 1507 "src/sfizz/OpcodeCleanup.cpp"
 yy212:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1541,12 +1545,12 @@ yy217:
 	yypmatch[2] = yyt1 - 4;
 	yypmatch[3] = yyt1 - 2;
 	yypmatch[5] = YYCURSOR - 1;
-#line 135 "src/sfizz/OpcodeCleanup.re"
+#line 139 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("start_", group(1), "cc", group(2));
         goto end_region;
     }
-#line 1550 "src/sfizz/OpcodeCleanup.cpp"
+#line 1554 "src/sfizz/OpcodeCleanup.cpp"
 yy219:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1646,12 +1650,12 @@ yy231:
 	yypmatch[3] = yyt2 - 1;
 	yypmatch[5] = yyt3 - 2;
 	yypmatch[7] = YYCURSOR - 1;
-#line 91 "src/sfizz/OpcodeCleanup.re"
+#line 95 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1655 "src/sfizz/OpcodeCleanup.cpp"
+#line 1659 "src/sfizz/OpcodeCleanup.cpp"
 yy233:
 	++YYCURSOR;
 	yynmatch = 3;
@@ -1661,12 +1665,12 @@ yy233:
 	yypmatch[2] = yyt1 - 8;
 	yypmatch[3] = yyt1 - 6;
 	yypmatch[5] = YYCURSOR - 1;
-#line 157 "src/sfizz/OpcodeCleanup.re"
+#line 161 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "hdcc", group(2));
         goto end_region;
     }
-#line 1670 "src/sfizz/OpcodeCleanup.cpp"
+#line 1674 "src/sfizz/OpcodeCleanup.cpp"
 yy235:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1682,12 +1686,12 @@ yy236:
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = yyt2 - 1;
 	yypmatch[5] = YYCURSOR - 1;
-#line 95 "src/sfizz/OpcodeCleanup.re"
+#line 99 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "_", group(2), "1");
         goto end_region;
     }
-#line 1691 "src/sfizz/OpcodeCleanup.cpp"
+#line 1695 "src/sfizz/OpcodeCleanup.cpp"
 yy238:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1717,12 +1721,12 @@ yy241:
 	yypmatch[2] = yyt3;
 	yypmatch[3] = yyt2;
 	yypmatch[1] = YYCURSOR;
-#line 152 "src/sfizz/OpcodeCleanup.re"
+#line 156 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("resonance1", group(1));
         goto end_region;
     }
-#line 1726 "src/sfizz/OpcodeCleanup.cpp"
+#line 1730 "src/sfizz/OpcodeCleanup.cpp"
 yy243:
 	yych = *++YYCURSOR;
 	if (yych <= 0x00) {
@@ -1775,12 +1779,12 @@ yy251:
 	yypmatch[2] = yyt1 - 6;
 	yypmatch[3] = yyt1 - 4;
 	yypmatch[5] = YYCURSOR - 1;
-#line 139 "src/sfizz/OpcodeCleanup.re"
+#line 143 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("start_", group(1), "hdcc", group(2));
         goto end_region;
     }
-#line 1784 "src/sfizz/OpcodeCleanup.cpp"
+#line 1788 "src/sfizz/OpcodeCleanup.cpp"
 yy253:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1878,12 +1882,12 @@ yy263:
 	yypmatch[3] = yyt2 - 1;
 	yypmatch[5] = yyt3 - 2;
 	yypmatch[7] = YYCURSOR - 1;
-#line 87 "src/sfizz/OpcodeCleanup.re"
+#line 91 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1887 "src/sfizz/OpcodeCleanup.cpp"
+#line 1891 "src/sfizz/OpcodeCleanup.cpp"
 yy265:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -1917,12 +1921,12 @@ yy268:
 	yypmatch[3] = yyt2 - 1;
 	yypmatch[5] = yyt3 - 2;
 	yypmatch[7] = YYCURSOR - 1;
-#line 83 "src/sfizz/OpcodeCleanup.re"
+#line 87 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3));
         goto end_region;
     }
-#line 1926 "src/sfizz/OpcodeCleanup.cpp"
+#line 1930 "src/sfizz/OpcodeCleanup.cpp"
 yy270:
 	yych = *++YYCURSOR;
 	if (yych >= 0x01) goto yy34;
@@ -1930,14 +1934,14 @@ yy270:
 	yynmatch = 1;
 	yypmatch[0] = YYCURSOR - 16;
 	yypmatch[1] = YYCURSOR;
-#line 121 "src/sfizz/OpcodeCleanup.re"
+#line 125 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = "group";
         goto end_region;
     }
-#line 1939 "src/sfizz/OpcodeCleanup.cpp"
+#line 1943 "src/sfizz/OpcodeCleanup.cpp"
 }
-#line 166 "src/sfizz/OpcodeCleanup.re"
+#line 170 "src/sfizz/OpcodeCleanup.re"
 
 
 end_region:
@@ -1952,7 +1956,7 @@ end_region:
     YYCURSOR = opcode.c_str();
 
     
-#line 1956 "src/sfizz/OpcodeCleanup.cpp"
+#line 1960 "src/sfizz/OpcodeCleanup.cpp"
 {
 	char yych;
 	yych = *YYCURSOR;
@@ -1963,11 +1967,11 @@ end_region:
 yy275:
 	++YYCURSOR;
 yy276:
-#line 186 "src/sfizz/OpcodeCleanup.re"
+#line 190 "src/sfizz/OpcodeCleanup.re"
 	{
         goto end_control;
     }
-#line 1971 "src/sfizz/OpcodeCleanup.cpp"
+#line 1975 "src/sfizz/OpcodeCleanup.cpp"
 yy277:
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch (yych) {
@@ -2065,14 +2069,14 @@ yy290:
 	yypmatch[0] = yyt1 - 10;
 	yypmatch[1] = YYCURSOR;
 	yypmatch[3] = YYCURSOR - 1;
-#line 181 "src/sfizz/OpcodeCleanup.re"
+#line 185 "src/sfizz/OpcodeCleanup.re"
 	{
         opcode = absl::StrCat("set_hdcc", group(1));
         goto end_control;
     }
-#line 2074 "src/sfizz/OpcodeCleanup.cpp"
+#line 2078 "src/sfizz/OpcodeCleanup.cpp"
 }
-#line 190 "src/sfizz/OpcodeCleanup.re"
+#line 194 "src/sfizz/OpcodeCleanup.re"
 
 
 end_control: