field names should not have _

to bring inline with the rest of the codebase