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

Rearrange CLI command names