Evaluation Model branch merge request 

Branch Ready!
=============
This branch changes some fields names to better represent the data stored on these.

Coverage Status
=============
Branch Model: 99.7%
Complete: 99.7%