diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee
index 66aedcf53..01281492a 100644
--- a/spec/text-editor-spec.coffee
+++ b/spec/text-editor-spec.coffee
@@ -4114,7 +4114,7 @@ describe "TextEditor", ->
         grammar = atom.grammars.selectGrammar("text.js")
         {line, tags} = grammar.tokenizeLine("var i; // http://github.com")
 
-        tokens = atom.grammars.decodeContent(line, tags)
+        tokens = atom.grammars.decodeTokens(line, tags)
         expect(tokens[0].value).toBe "var"
         expect(tokens[0].scopes).toEqual ["source.js", "storage.modifier.js"]
 
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index ec13af201..66d426d7c 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -148,7 +148,7 @@ class TokenizedLine
   Object.defineProperty @prototype, 'tokens', get: ->
     offset = 0
 
-    atom.grammars.decodeContent @text, @tags, @parentScopes.slice(), (tokenProperties, index) =>
+    atom.grammars.decodeTokens @text, @tags, @parentScopes.slice(), (tokenProperties, index) =>
       switch @specialTokens[index]
         when SoftTab
           tokenProperties.isAtomic = true