Rename key variables
First not-entirely-accurate model done