Changed snake case to camel case and the names to assert convention