Clean up naming of commands and states