SQL: Rename sqls after recent merges