diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache b/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache
index bfeb2307ff8..72c5480ad0d 100644
--- a/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache
+++ b/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache
@@ -16,9 +16,8 @@ namespace {{packageName}}.Controllers
 { {{#operations}}
     /// <summary>
     /// {{description}}
-    /// </summary>{{#description}}{{#basePath}}
-    [Route("{{{basePath}}}")]
-    {{/basePath}}[Description("{{description}}")]{{/description}}
+    /// </summary>{{#description}}
+    [Description("{{description}}")]{{/description}}
     public class {{classname}}Controller : Controller
     { {{#operation}}
 
@@ -29,7 +28,7 @@ namespace {{packageName}}.Controllers
         /// <param name="{{paramName}}">{{description}}</param>{{/allParams}}{{#responses}}
         /// <response code="{{code}}">{{message}}</response>{{/responses}}
         [{{httpMethod}}]
-        [Route("{{path}}")]
+        [Route("{{basePathWithoutHost}}{{path}}")]
         [SwaggerOperation("{{operationId}}")]{{#returnType}}
         [SwaggerResponse(200, type: typeof({{&returnType}}))]{{/returnType}}
         public virtual {{#returnType}}IActionResult{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
index 8b6c8f3e09f..abac9871dc7 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
@@ -48,7 +48,7 @@ public class PetApiController : Controller
         /// <param name="body">Pet object that needs to be added to the store</param>
         /// <response code="405">Invalid input</response>
         [HttpPost]
-        [Route("/pet")]
+        [Route("/v2/pet")]
         [SwaggerOperation("AddPet")]
         public virtual void AddPet([FromBody]Pet body)
         { 
@@ -64,7 +64,7 @@ public virtual void AddPet([FromBody]Pet body)
         /// <param name="apiKey"></param>
         /// <response code="400">Invalid pet value</response>
         [HttpDelete]
-        [Route("/pet/{petId}")]
+        [Route("/v2/pet/{petId}")]
         [SwaggerOperation("DeletePet")]
         public virtual void DeletePet([FromRoute]long? petId, [FromHeader]string apiKey)
         { 
@@ -80,7 +80,7 @@ public virtual void DeletePet([FromRoute]long? petId, [FromHeader]string apiKey)
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid status value</response>
         [HttpGet]
-        [Route("/pet/findByStatus")]
+        [Route("/v2/pet/findByStatus")]
         [SwaggerOperation("FindPetsByStatus")]
         [SwaggerResponse(200, type: typeof(List<Pet>))]
         public virtual IActionResult FindPetsByStatus([FromQuery]List<string> status)
@@ -102,7 +102,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery]List<string> status)
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid tag value</response>
         [HttpGet]
-        [Route("/pet/findByTags")]
+        [Route("/v2/pet/findByTags")]
         [SwaggerOperation("FindPetsByTags")]
         [SwaggerResponse(200, type: typeof(List<Pet>))]
         public virtual IActionResult FindPetsByTags([FromQuery]List<string> tags)
@@ -125,7 +125,7 @@ public virtual IActionResult FindPetsByTags([FromQuery]List<string> tags)
         /// <response code="400">Invalid ID supplied</response>
         /// <response code="404">Pet not found</response>
         [HttpGet]
-        [Route("/pet/{petId}")]
+        [Route("/v2/pet/{petId}")]
         [SwaggerOperation("GetPetById")]
         [SwaggerResponse(200, type: typeof(Pet))]
         public virtual IActionResult GetPetById([FromRoute]long? petId)
@@ -148,7 +148,7 @@ public virtual IActionResult GetPetById([FromRoute]long? petId)
         /// <response code="404">Pet not found</response>
         /// <response code="405">Validation exception</response>
         [HttpPut]
-        [Route("/pet")]
+        [Route("/v2/pet")]
         [SwaggerOperation("UpdatePet")]
         public virtual void UpdatePet([FromBody]Pet body)
         { 
@@ -165,7 +165,7 @@ public virtual void UpdatePet([FromBody]Pet body)
         /// <param name="status">Updated status of the pet</param>
         /// <response code="405">Invalid input</response>
         [HttpPost]
-        [Route("/pet/{petId}")]
+        [Route("/v2/pet/{petId}")]
         [SwaggerOperation("UpdatePetWithForm")]
         public virtual void UpdatePetWithForm([FromRoute]long? petId, [FromForm]string name, [FromForm]string status)
         { 
@@ -182,7 +182,7 @@ public virtual void UpdatePetWithForm([FromRoute]long? petId, [FromForm]string n
         /// <param name="file">file to upload</param>
         /// <response code="200">successful operation</response>
         [HttpPost]
-        [Route("/pet/{petId}/uploadImage")]
+        [Route("/v2/pet/{petId}/uploadImage")]
         [SwaggerOperation("UploadFile")]
         [SwaggerResponse(200, type: typeof(ApiResponse))]
         public virtual IActionResult UploadFile([FromRoute]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream file)
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
index 26784668ba6..da0b7b0d67a 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
@@ -49,7 +49,7 @@ public class StoreApiController : Controller
         /// <response code="400">Invalid ID supplied</response>
         /// <response code="404">Order not found</response>
         [HttpDelete]
-        [Route("/store/order/{orderId}")]
+        [Route("/v2/store/order/{orderId}")]
         [SwaggerOperation("DeleteOrder")]
         public virtual void DeleteOrder([FromRoute]string orderId)
         { 
@@ -63,7 +63,7 @@ public virtual void DeleteOrder([FromRoute]string orderId)
         /// <remarks>Returns a map of status codes to quantities</remarks>
         /// <response code="200">successful operation</response>
         [HttpGet]
-        [Route("/store/inventory")]
+        [Route("/v2/store/inventory")]
         [SwaggerOperation("GetInventory")]
         [SwaggerResponse(200, type: typeof(Dictionary<string, int?>))]
         public virtual IActionResult GetInventory()
@@ -86,7 +86,7 @@ public virtual IActionResult GetInventory()
         /// <response code="400">Invalid ID supplied</response>
         /// <response code="404">Order not found</response>
         [HttpGet]
-        [Route("/store/order/{orderId}")]
+        [Route("/v2/store/order/{orderId}")]
         [SwaggerOperation("GetOrderById")]
         [SwaggerResponse(200, type: typeof(Order))]
         public virtual IActionResult GetOrderById([FromRoute]long? orderId)
@@ -108,7 +108,7 @@ public virtual IActionResult GetOrderById([FromRoute]long? orderId)
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid Order</response>
         [HttpPost]
-        [Route("/store/order")]
+        [Route("/v2/store/order")]
         [SwaggerOperation("PlaceOrder")]
         [SwaggerResponse(200, type: typeof(Order))]
         public virtual IActionResult PlaceOrder([FromBody]Order body)
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
index 1cfacdd09a7..023fc4366bc 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
@@ -48,7 +48,7 @@ public class UserApiController : Controller
         /// <param name="body">Created user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/user")]
+        [Route("/v2/user")]
         [SwaggerOperation("CreateUser")]
         public virtual void CreateUser([FromBody]User body)
         { 
@@ -63,7 +63,7 @@ public virtual void CreateUser([FromBody]User body)
         /// <param name="body">List of user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/user/createWithArray")]
+        [Route("/v2/user/createWithArray")]
         [SwaggerOperation("CreateUsersWithArrayInput")]
         public virtual void CreateUsersWithArrayInput([FromBody]List<User> body)
         { 
@@ -78,7 +78,7 @@ public virtual void CreateUsersWithArrayInput([FromBody]List<User> body)
         /// <param name="body">List of user object</param>
         /// <response code="0">successful operation</response>
         [HttpPost]
-        [Route("/user/createWithList")]
+        [Route("/v2/user/createWithList")]
         [SwaggerOperation("CreateUsersWithListInput")]
         public virtual void CreateUsersWithListInput([FromBody]List<User> body)
         { 
@@ -94,7 +94,7 @@ public virtual void CreateUsersWithListInput([FromBody]List<User> body)
         /// <response code="400">Invalid username supplied</response>
         /// <response code="404">User not found</response>
         [HttpDelete]
-        [Route("/user/{username}")]
+        [Route("/v2/user/{username}")]
         [SwaggerOperation("DeleteUser")]
         public virtual void DeleteUser([FromRoute]string username)
         { 
@@ -111,7 +111,7 @@ public virtual void DeleteUser([FromRoute]string username)
         /// <response code="400">Invalid username supplied</response>
         /// <response code="404">User not found</response>
         [HttpGet]
-        [Route("/user/{username}")]
+        [Route("/v2/user/{username}")]
         [SwaggerOperation("GetUserByName")]
         [SwaggerResponse(200, type: typeof(User))]
         public virtual IActionResult GetUserByName([FromRoute]string username)
@@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute]string username)
         /// <response code="200">successful operation</response>
         /// <response code="400">Invalid username/password supplied</response>
         [HttpGet]
-        [Route("/user/login")]
+        [Route("/v2/user/login")]
         [SwaggerOperation("LoginUser")]
         [SwaggerResponse(200, type: typeof(string))]
         public virtual IActionResult LoginUser([FromQuery]string username, [FromQuery]string password)
@@ -154,7 +154,7 @@ public virtual IActionResult LoginUser([FromQuery]string username, [FromQuery]st
         /// <remarks></remarks>
         /// <response code="0">successful operation</response>
         [HttpGet]
-        [Route("/user/logout")]
+        [Route("/v2/user/logout")]
         [SwaggerOperation("LogoutUser")]
         public virtual void LogoutUser()
         { 
@@ -171,7 +171,7 @@ public virtual void LogoutUser()
         /// <response code="400">Invalid user supplied</response>
         /// <response code="404">User not found</response>
         [HttpPut]
-        [Route("/user/{username}")]
+        [Route("/v2/user/{username}")]
         [SwaggerOperation("UpdateUser")]
         public virtual void UpdateUser([FromRoute]string username, [FromBody]User body)
         { 
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs
index e34c3edf374..ab83518032c 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// Describes the result of uploading an image resource
     /// </summary>
     [DataContract]
     public partial class ApiResponse :  IEquatable<ApiResponse>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
index 15f10eb9aa7..8e1404c7338 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// A category for a pet
     /// </summary>
     [DataContract]
     public partial class Category :  IEquatable<Category>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
index a49276583c6..b20143353cc 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// An order for a pets from the pet store
     /// </summary>
     [DataContract]
     public partial class Order :  IEquatable<Order>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
index 6c4afd3b95e..9a6f87a2945 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// A pet for sale in the pet store
     /// </summary>
     [DataContract]
     public partial class Pet :  IEquatable<Pet>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
index 4f2cc3e5cef..55269f40675 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// A tag for a pet
     /// </summary>
     [DataContract]
     public partial class Tag :  IEquatable<Tag>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
index 8933e370956..1dbde78cb0b 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
@@ -33,7 +33,7 @@
 namespace IO.Swagger.Models
 {
     /// <summary>
-    /// 
+    /// A User who is purchasing from the pet store
     /// </summary>
     [DataContract]
     public partial class User :  IEquatable<User>