SQLs: Rename SQLs after recent PR merges