diff --git a/src/pgsql/pgsql-ddl.lisp b/src/pgsql/pgsql-ddl.lisp
index 008fe7d5..662bc950 100644
--- a/src/pgsql/pgsql-ddl.lisp
+++ b/src/pgsql/pgsql-ddl.lisp
@@ -266,9 +266,7 @@
                                  :collect (column-type-name
                                            (find idx-col tbl-cols
                                                  :test #'string-equal
-                                                 :key (lambda (col)
-                                                        (ensure-unquoted
-                                                         (column-name col)))))))
+                                                 :key #'column-name))))
                   (nobtree (catalog-types-without-btree
                             (schema-catalog (table-schema (index-table index))))))
              (let* ((idx-type (first idx-types))
diff --git a/src/sources/sqlite/sqlite-schema.lisp b/src/sources/sqlite/sqlite-schema.lisp
index 7174fea4..17f05ba6 100644
--- a/src/sources/sqlite/sqlite-schema.lisp
+++ b/src/sources/sqlite/sqlite-schema.lisp
@@ -150,7 +150,7 @@
   "Return the list of columns in INDEX-NAME."
   (let ((sql (format nil (sql "/sqlite/list-index-cols.sql") index-name)))
     (loop :for (index-pos table-pos col-name) :in (sqlite:execute-to-list db sql)
-       :collect col-name)))
+       :collect (apply-identifier-case col-name))))
 
 (defun list-indexes (table &optional (db *sqlite-db*))
   "Return the list of indexes attached to TABLE."