update command names
clean up cli.py a bit