BATCHEE-26 rename table names