rename models to underscore syntax
code review feedback