diff --git a/eslint/babel-eslint-parser/acorn-to-esprima.js b/eslint/babel-eslint-parser/acorn-to-esprima.js
index 229b3b7c32..4c12108574 100644
--- a/eslint/babel-eslint-parser/acorn-to-esprima.js
+++ b/eslint/babel-eslint-parser/acorn-to-esprima.js
@@ -119,7 +119,8 @@ function convertTemplateType(tokens) {
     var templateToken = {
       type: "Template",
       value: createTemplateValue(start, end),
-      range: [tokens[start].start, tokens[end].end],
+      start: tokens[start].start,
+      end: tokens[end].end,
       loc: {
         start: tokens[start].loc.start,
         end: tokens[end].loc.end
@@ -175,12 +176,12 @@ function convertTemplateType(tokens) {
 var astTransformVisitor = {
   noScope: true,
   enter: function (node) {
+    node.range = [node.start, node.end];
+
     // private var to track original node type
     node._babelType = node.type;
   },
   exit: function (node) { /* parent */
-    node.range = [node.start, node.end];
-
     if (this.isSpreadProperty()) {
       node.type = "Property";
       node.kind = "init";