normalize some of the command names