Renamed some things in the data getter.
This should have never been there!