diff --git a/lib/ace/mode/sqlserver_highlight_rules.js b/lib/ace/mode/sqlserver_highlight_rules.js
index 6d23f6a3..4a7a7658 100644
--- a/lib/ace/mode/sqlserver_highlight_rules.js
+++ b/lib/ace/mode/sqlserver_highlight_rules.js
@@ -224,14 +224,14 @@ var SqlServerHighlightRules = function() {
             meta = 'keyword';
     
         if (modCache[word] === undefined) {
-            if (builtInStoredProcedures.indexOf(word) !== -1) meta = "storedProcedure";
+            if (builtInStoredProcedures.indexOf(word) !== -1) meta = "procedure";
             else {
                 //all others are upper case
                 word = word.toUpperCase();
                 if (builtinFunctions.indexOf(word) !== -1) meta = "function";
-                else if (dataTypes.indexOf(word) !== -1) meta = "dataType";
-                else if (setStatements.indexOf(word) !== -1) meta = "setStatement";
-                else if (logicalOperators.indexOf(word) !== -1) meta = "logicalOperator";
+                else if (dataTypes.indexOf(word) !== -1) meta = "type";
+                else if (setStatements.indexOf(word) !== -1) meta = "statement";
+                else if (logicalOperators.indexOf(word) !== -1) meta = "operator";
             }
             modCache[word] = {
                 word: word,