Fix missclassified call, rename and fixes. Just as a playground, the keyword map macro is still in
there :-)