Update SQLEditor for new naming conventions
Merge pull request #1645 from Cottser/sqleditor

Update SQLEditor for new naming conventions