Added missing data array assignment, further renaming