diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs
index 03b023de..340ea998 100644
--- a/server/AyaNova/Controllers/PartController.cs
+++ b/server/AyaNova/Controllers/PartController.cs
@@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers
 {
     [ApiController]
     [ApiVersion("8.0")]
-    [Route("api/v{version:apiVersion}/[controller]")]
+    [Route("api/v{version:apiVersion}/part")]
     [Produces("application/json")]
     [Authorize]
     public class PartController : ControllerBase
diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs
index 3c8b7428..a6898d0f 100644
--- a/server/AyaNova/Controllers/PickListController.cs
+++ b/server/AyaNova/Controllers/PickListController.cs
@@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers
 
     [ApiController]
     [ApiVersion("8.0")]
-    [Route("api/v{version:apiVersion}/[controller]")]
+    [Route("api/v{version:apiVersion}/pick-list")]
     [Produces("application/json")]
     [Authorize]
     public class PickListController : ControllerBase
@@ -57,7 +57,7 @@ namespace AyaNova.Api.Controllers
         /// <param name="inactive">Include inactive objects in the returned list </param>
         /// <param name="preId">Return only one item (for pre-selected items on forms) </param>
         /// <returns>Filtered list</returns>
-        [HttpGet("List")]
+        [HttpGet("list")]
         public async Task<IActionResult> GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long? preId)
         {
             if (serverState.IsClosed)
@@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers
         /// </summary>
         /// <param name="ayaType"></param>
         /// <returns>The current effective template, either a customized one or the default</returns>
-        [HttpGet("Template/{ayaType}")]
+        [HttpGet("template/{ayaType}")]
         public async Task<IActionResult> GetPickListTemplate([FromRoute] AyaType ayaType)
         {
             if (serverState.IsClosed)
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
         /// List of all PickList templates
         /// </summary>        
         /// <returns>List of strings</returns>
-        [HttpGet("Template/List")]
+        [HttpGet("template/list")]
         public ActionResult GetTemplateList()
         {
             if (!serverState.IsOpen)
@@ -153,7 +153,7 @@ namespace AyaNova.Api.Controllers
         /// <param name="template"></param>
         /// <returns></returns>
        // [HttpPost("Template/{ayaType}")]
-        [HttpPost("Template")]
+        [HttpPost("template")]
         public async Task<IActionResult> ReplacePickListTemplate([FromBody] PickListTemplate template)
         {
             if (!serverState.IsOpen)
@@ -192,7 +192,7 @@ namespace AyaNova.Api.Controllers
         /// </summary>
         /// <param name="ayaType"></param>
         /// <returns>Ok</returns>
-        [HttpDelete("Template/{ayaType}")]
+        [HttpDelete("template/{ayaType}")]
         public async Task<IActionResult> DeletePickListTemplate([FromRoute] AyaType ayaType)
         {
             if (!serverState.IsOpen)
@@ -219,7 +219,7 @@ namespace AyaNova.Api.Controllers
         /// List of all fields for pick list AyaType specified
         /// </summary>        
         /// <returns>List of fields available for template</returns>
-        [HttpGet("Template/ListFields/{ayaType}")]
+        [HttpGet("template/listfields/{ayaType}")]
         public ActionResult GetPickListFields([FromRoute] AyaType ayaType)
         {
             if (!serverState.IsOpen)