diff --git a/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj b/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj
index 2168cb71e0..2bd07e52db 100644
--- a/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj
+++ b/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj
@@ -71,7 +71,7 @@
     <Compile Include="RouterMiddleware.cs" />
     <Compile Include="RouteValueDictionary.cs" />
     <Compile Include="RoutingServices.cs" />
-    <Compile Include="Template\Template.cs" />
+    <Compile Include="Template\RouteTemplate.cs" />
     <Compile Include="Template\TemplateBinder.cs" />
     <Compile Include="Template\TemplateMatcher.cs" />
     <Compile Include="Template\TemplateParser.cs" />
diff --git a/src/Microsoft.AspNet.Routing/Template/Template.cs b/src/Microsoft.AspNet.Routing/Template/RouteTemplate.cs
similarity index 93%
rename from src/Microsoft.AspNet.Routing/Template/Template.cs
rename to src/Microsoft.AspNet.Routing/Template/RouteTemplate.cs
index e4386dc5b9..06270c79ef 100644
--- a/src/Microsoft.AspNet.Routing/Template/Template.cs
+++ b/src/Microsoft.AspNet.Routing/Template/RouteTemplate.cs
@@ -9,11 +9,11 @@ using System.Linq;
 namespace Microsoft.AspNet.Routing.Template
 {
     [DebuggerDisplay("{DebuggerToString()}")]
-    public class Template
+    public class RouteTemplate
     {
         private const string SeparatorString = "/";
 
-        public Template(List<TemplateSegment> segments)
+        public RouteTemplate(List<TemplateSegment> segments)
         {
             if (segments == null)
             {
diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs b/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
index cc7bea4008..c381a66bbf 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
@@ -14,9 +14,9 @@ namespace Microsoft.AspNet.Routing.Template
     public class TemplateBinder
     {
         private readonly IDictionary<string, object> _defaults;
-        private readonly Template _template;
+        private readonly RouteTemplate _template;
 
-        public TemplateBinder(Template template, IDictionary<string, object> defaults)
+        public TemplateBinder(RouteTemplate template, IDictionary<string, object> defaults)
         {
             if (template == null)
             {
diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateMatcher.cs b/src/Microsoft.AspNet.Routing/Template/TemplateMatcher.cs
index bdef28549f..7179ed46a8 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateMatcher.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateMatcher.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Routing.Template
 
         private static readonly char[] Delimiters = new char[] { SeparatorChar };
 
-        public TemplateMatcher(Template template)
+        public TemplateMatcher(RouteTemplate template)
         {
             if (template == null)
             {
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Routing.Template
             Template = template;
         }
 
-        public Template Template { get; private set; }
+        public RouteTemplate Template { get; private set; }
 
         public IDictionary<string, object> Match(string requestPath, IDictionary<string, object> defaults)
         {
diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateParser.cs b/src/Microsoft.AspNet.Routing/Template/TemplateParser.cs
index c289829273..813b9d545a 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateParser.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateParser.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Routing.Template
         private const char EqualsSign = '=';
         private const char QuestionMark = '?';
         
-        public static Template Parse(string routeTemplate, IInlineConstraintResolver constraintResolver)
+        public static RouteTemplate Parse(string routeTemplate, IInlineConstraintResolver constraintResolver)
         {
             if (routeTemplate == null)
             {
@@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Routing.Template
 
             if (IsAllValid(context, segments))
             {
-                return new Template(segments);
+                return new RouteTemplate(segments);
             }
             else
             {
diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
index 6a73d0d97f..095d58a5d0 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Routing.Template
         private readonly IDictionary<string, object> _defaults;
         private readonly IDictionary<string, IRouteConstraint> _constraints;
         private readonly IRouter _target;
-        private readonly Template _parsedTemplate;
+        private readonly RouteTemplate _parsedTemplate;
         private readonly string _routeTemplate;
         private readonly TemplateMatcher _matcher;
         private readonly TemplateBinder _binder;
diff --git a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
index 5f5ce1665a..4765ad189e 100644
--- a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
@@ -287,7 +287,7 @@ namespace Microsoft.AspNet.Routing.Tests
             return templatePart;
         }
 
-        private static Template.Template ParseRouteTemplate(string template)
+        private static RouteTemplate ParseRouteTemplate(string template)
         {
             var _constraintResolver = GetConstraintResolver();
             return TemplateParser.Parse(template, _constraintResolver);
diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
index 2a8bcd3bee..cdbb39b531 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "cool";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateLiteral("cool"));
 
@@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "{p}";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p", false, false, defaultValue: null, inlineConstraint: null));
             expected.Parameters.Add(expected.Segments[0].Parts[0]);
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "{p?}";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p", false, true, defaultValue: null, inlineConstraint: null));
             expected.Parameters.Add(expected.Segments[0].Parts[0]);
@@ -67,7 +67,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "cool/awesome/super";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateLiteral("cool"));
             expected.Segments.Add(new TemplateSegment());
@@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "{p1}/{p2}/{*p3}";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
 
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p1",
@@ -127,7 +127,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -136,7 +136,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "cool-{p1}";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateLiteral("cool-"));
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p1",
@@ -150,7 +150,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "{p1}-cool";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p1",
                                                                         false,
@@ -173,7 +173,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -182,7 +182,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "{p1}-cool-{p2}";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p1",
                                                                         false,
@@ -202,7 +202,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -211,7 +211,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             // Arrange
             var template = "cool-{p1}-awesome";
 
-            var expected = new Template(new List<TemplateSegment>());
+            var expected = new RouteTemplate(new List<TemplateSegment>());
             expected.Segments.Add(new TemplateSegment());
             expected.Segments[0].Parts.Add(TemplatePart.CreateLiteral("cool-"));
             expected.Segments[0].Parts.Add(TemplatePart.CreateParameter("p1",
@@ -226,7 +226,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             var actual = TemplateParser.Parse(template, _inlineConstraintResolver);
 
             // Assert
-            Assert.Equal<Template>(expected, actual, new TemplateEqualityComparer());
+            Assert.Equal<RouteTemplate>(expected, actual, new TemplateEqualityComparer());
         }
 
         [Fact]
@@ -454,9 +454,9 @@ namespace Microsoft.AspNet.Routing.Template.Tests
             return new DefaultInlineConstraintResolver(serviceProvider, accessor);
         }
 
-        private class TemplateEqualityComparer : IEqualityComparer<Template>
+        private class TemplateEqualityComparer : IEqualityComparer<RouteTemplate>
         {
-            public bool Equals(Template x, Template y)
+            public bool Equals(RouteTemplate x, RouteTemplate y)
             {
                 if (x == null && y == null)
                 {
@@ -522,7 +522,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests
                 return true;
             }
 
-            public int GetHashCode(Template obj)
+            public int GetHashCode(RouteTemplate obj)
             {
                 throw new NotImplementedException();
             }