Rename cmds to commands