diff --git a/js/codemirror/addon/lint/sql-lint.js b/js/codemirror/addon/lint/sql-lint.js
index 2e8a5ac435..25c9ef9bd7 100644
--- a/js/codemirror/addon/lint/sql-lint.js
+++ b/js/codemirror/addon/lint/sql-lint.js
@@ -16,7 +16,7 @@ CodeMirror.sqlLint = function(text, updateLinting, options, cm) {
                 to: CodeMirror.Pos(
                     response[idx].toLine, response[idx].toColumn
                 ),
-                message_html: response[idx].message,
+                messageHTML: response[idx].message,
                 severity : response[idx].severity
             });
         }
diff --git a/js/vendor/codemirror/addon/lint/lint.js b/js/vendor/codemirror/addon/lint/lint.js
index 1dadbc4231..44208a6969 100644
--- a/js/vendor/codemirror/addon/lint/lint.js
+++ b/js/vendor/codemirror/addon/lint/lint.js
@@ -116,8 +116,8 @@
      * The HTML support is patched, submitted upstream at
      * https://github.com/codemirror/CodeMirror/pull/4861
      */
-    if (typeof ann.message_html != 'undefined') {
-        tip.innerHTML = ann.message_html;
+    if (typeof ann.messageHTML != 'undefined') {
+        tip.innerHTML = ann.messageHTML;
     } else {
         tip.appendChild(document.createTextNode(ann.message));
     }