Refactor to have camelcase naming.