Bug 30275: (QA follow-up) Rename columns to match API