Changing nomenclature of Model Params -> Properties.
more renaming and a little refactoring around properties.