Changed ids for data set sections to maintain order
changed data element names as per rqmt