commands: Review changes for wording etc (#570)