Convert to use underscore convention
Convert rest