Bug 23916: (follow-up) Fix column name collision