cleanup and renaming around DataItem

Merge request reports

Loading