Rearrange CLI command names
Merge pull request #98 from wmde/commands

Rearrange CLI command names