Refactored sql view names.