Rename command handling to be clearer