Problem: command names are not nice

Solution: use more explicit command names
Merge pull request #6 from hintjens/master

Problem: command names are not nice