Rename "columns.*" to "keys.*"