Changed return states to be CamelCase