updated all datasources to new column format

Change-Id: If03756bde8fc6ee7cd914884eb7133f7b600df66