Changed naming scheme from camelcase to underscore