Drop the underscores and keep to camel casing