Replaced camel case states with snail_case