Bug 33137: Make column names match