Replace QString * with QString & where needed
Rename remaining DataItems to DataBlocks