BATCHEE-25 remove reserved words from our DB columns