SQL: Rename SQL after recent PR merge