Bug 23916: (follow-up) Adapt all the things to the new column and accessor names