diff --git a/tests/Makefile b/tests/Makefile
index e1b3875..ff23373 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,37 +19,37 @@
              osx.h osx.c osx_name.h osx_name.c
 	$(CC) -Wall -o $@ $(filter %.c, $^)
 osx2win32.c: $(SOURCES)
-	$(GEN) --lang stdc code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang stdc $(DATA) osx win32 > $@
 osx2win32.h: $(SOURCES)
-	$(GEN) --lang stdc-header code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang stdc-header $(DATA) osx win32 > $@
 osx2win32_name.c: $(SOURCES)
-	$(GEN) --lang stdc name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang stdc $(DATA) osx win32 > $@
 osx2win32_name.h: $(SOURCES)
-	$(GEN) --lang stdc-header name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang stdc-header $(DATA) osx win32 > $@
 osx2xkb.c: $(SOURCES)
-	$(GEN) --lang stdc code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang stdc $(DATA) osx xkb > $@
 osx2xkb.h: $(SOURCES)
-	$(GEN) --lang stdc-header code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang stdc-header $(DATA) osx xkb > $@
 osx2xkb_name.c: $(SOURCES)
-	$(GEN) --lang stdc name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang stdc $(DATA) osx xkb > $@
 osx2xkb_name.h: $(SOURCES)
-	$(GEN) --lang stdc-header name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang stdc-header $(DATA) osx xkb > $@
 html2win32.c: $(SOURCES)
-	$(GEN) --lang stdc code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang stdc $(DATA) html win32 > $@
 html2win32.h: $(SOURCES)
-	$(GEN) --lang stdc-header code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang stdc-header $(DATA) html win32 > $@
 html2win32_name.c: $(SOURCES)
-	$(GEN) --lang stdc name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang stdc $(DATA) html win32 > $@
 html2win32_name.h: $(SOURCES)
-	$(GEN) --lang stdc-header name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang stdc-header $(DATA) html win32 > $@
 osx.c: $(SOURCES)
-	$(GEN) --lang stdc code-table $(DATA) osx > $@
+	$(GEN) code-table --lang stdc $(DATA) osx > $@
 osx.h: $(SOURCES)
-	$(GEN) --lang stdc-header code-table $(DATA) osx > $@
+	$(GEN) code-table --lang stdc-header $(DATA) osx > $@
 osx_name.c: $(SOURCES)
-	$(GEN) --lang stdc name-table $(DATA) osx > $@
+	$(GEN) name-table --lang stdc $(DATA) osx > $@
 osx_name.h: $(SOURCES)
-	$(GEN) --lang stdc-header name-table $(DATA) osx > $@
+	$(GEN) name-table --lang stdc-header $(DATA) osx > $@
 
 stdc++: stdc++.cc osx2win32.hh osx2win32.cc osx2win32_name.hh osx2win32_name.cc \
              osx2xkb.hh osx2xkb.cc osx2xkb_name.hh osx2xkb_name.cc \
@@ -57,58 +57,58 @@
              osx.hh osx.cc osx_name.hh osx_name.cc
 	$(CXX) -Wall -std=c++11 -o $@ $(filter %.cc, $^)
 osx2win32.cc: $(SOURCES)
-	$(GEN) --lang stdc++ code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang stdc++ $(DATA) osx win32 > $@
 osx2win32.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang stdc++-header $(DATA) osx win32 > $@
 osx2win32_name.cc: $(SOURCES)
-	$(GEN) --lang stdc++ name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang stdc++ $(DATA) osx win32 > $@
 osx2win32_name.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang stdc++-header $(DATA) osx win32 > $@
 osx2xkb.cc: $(SOURCES)
-	$(GEN) --lang stdc++ code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang stdc++ $(DATA) osx xkb > $@
 osx2xkb.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang stdc++-header $(DATA) osx xkb > $@
 osx2xkb_name.cc: $(SOURCES)
-	$(GEN) --lang stdc++ name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang stdc++ $(DATA) osx xkb > $@
 osx2xkb_name.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang stdc++-header $(DATA) osx xkb > $@
 html2win32.cc: $(SOURCES)
-	$(GEN) --lang stdc++ code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang stdc++ $(DATA) html win32 > $@
 html2win32.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang stdc++-header $(DATA) html win32 > $@
 html2win32_name.cc: $(SOURCES)
-	$(GEN) --lang stdc++ name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang stdc++ $(DATA) html win32 > $@
 html2win32_name.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang stdc++-header $(DATA) html win32 > $@
 osx.cc: $(SOURCES)
-	$(GEN) --lang stdc++ code-table $(DATA) osx > $@
+	$(GEN) code-table --lang stdc++ $(DATA) osx > $@
 osx.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header code-table $(DATA) osx > $@
+	$(GEN) code-table --lang stdc++-header $(DATA) osx > $@
 osx_name.cc: $(SOURCES)
-	$(GEN) --lang stdc++ name-table $(DATA) osx > $@
+	$(GEN) name-table --lang stdc++ $(DATA) osx > $@
 osx_name.hh: $(SOURCES)
-	$(GEN) --lang stdc++-header name-table $(DATA) osx > $@
+	$(GEN) name-table --lang stdc++-header $(DATA) osx > $@
 
 python2: osx2win32.py osx2win32_name.py \
          osx2xkb.py osx2xkb_name.py \
          html2win32.py html2win32_name.py \
          osx.py osx_name.py
 osx2win32.py: $(SOURCES)
-	$(GEN) --lang python2 code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang python2 $(DATA) osx win32 > $@
 osx2win32_name.py: $(SOURCES)
-	$(GEN) --lang python2 name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang python2 $(DATA) osx win32 > $@
 osx2xkb.py: $(SOURCES)
-	$(GEN) --lang python2 code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang python2 $(DATA) osx xkb > $@
 osx2xkb_name.py: $(SOURCES)
-	$(GEN) --lang python2 name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang python2 $(DATA) osx xkb > $@
 html2win32.py: $(SOURCES)
-	$(GEN) --lang python2 code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang python2 $(DATA) html win32 > $@
 html2win32_name.py: $(SOURCES)
-	$(GEN) --lang python2 name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang python2 $(DATA) html win32 > $@
 osx.py: $(SOURCES)
-	$(GEN) --lang python2 code-table $(DATA) osx > $@
+	$(GEN) code-table --lang python2 $(DATA) osx > $@
 osx_name.py: $(SOURCES)
-	$(GEN) --lang python2 name-table $(DATA) osx > $@
+	$(GEN) name-table --lang python2 $(DATA) osx > $@
 
 javascript: node_modules/babel-core \
             node_modules/babel-plugin-transform-es2015-modules-commonjs \
@@ -121,21 +121,21 @@
 node_modules/babel-plugin-transform-es2015-modules-commonjs:
 	npm install babel-plugin-transform-es2015-modules-commonjs
 osx2win32.js: $(SOURCES)
-	$(GEN) --lang js code-map $(DATA) osx win32 > $@
+	$(GEN) code-map --lang js $(DATA) osx win32 > $@
 osx2win32_name.js: $(SOURCES)
-	$(GEN) --lang js name-map $(DATA) osx win32 > $@
+	$(GEN) name-map --lang js $(DATA) osx win32 > $@
 osx2xkb.js: $(SOURCES)
-	$(GEN) --lang js code-map $(DATA) osx xkb > $@
+	$(GEN) code-map --lang js $(DATA) osx xkb > $@
 osx2xkb_name.js: $(SOURCES)
-	$(GEN) --lang js name-map $(DATA) osx xkb > $@
+	$(GEN) name-map --lang js $(DATA) osx xkb > $@
 html2win32.js: $(SOURCES)
-	$(GEN) --lang js code-map $(DATA) html win32 > $@
+	$(GEN) code-map --lang js $(DATA) html win32 > $@
 html2win32_name.js: $(SOURCES)
-	$(GEN) --lang js name-map $(DATA) html win32 > $@
+	$(GEN) name-map --lang js $(DATA) html win32 > $@
 osx.js: $(SOURCES)
-	$(GEN) --lang js code-table $(DATA) osx > $@
+	$(GEN) code-table --lang js $(DATA) osx > $@
 osx_name.js: $(SOURCES)
-	$(GEN) --lang js name-table $(DATA) osx > $@
+	$(GEN) name-table --lang js $(DATA) osx > $@
 
 clean:
 	rm -rf node_modules