Fix compound command names in functions and tests

Replace underscores with spaces in compound command names (e.g. CONFIG
SET). Fix generator templates.