Changes to function names etc. from 9.16 meeting
Data renaming
Renamed data