some camel-case renaming