Change some names in model, add validators and tests

https://www.pivotaltracker.com/story/show/66911404
[Finished #66911404]