Rename a few things
Cmd code review feedback