minor adjustments to models

rename a few properties, adjust types, etc.