Use uniform prefix with the column names Bug: T270033 Change-Id: I9ee1f8ac9a8d0e575e16344910495f341c2714db