Update to case_insensitive column and table names