Renaming variables to better match actual implementation.
[FIX] Name of Data object attributes.