further renaming/model adjustments per scott