Close #391 - Invert naming of commands conventions