diff --git a/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs b/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
index 050ac36f..d938d17b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
@@ -133,7 +133,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Cms
             }
         }
 
-        public async Task HandleListRegisteredServersRequest(ListRegisteredServerParams listServerParams, RequestContext<ListRegisteredServersResult> requestContext)
+        public async Task HandleListRegisteredServersRequest(ListRegisteredServersParams listServerParams, RequestContext<ListRegisteredServersResult> requestContext)
         {
             Logger.Write(TraceEventType.Verbose, "HandleListRegisteredServersRequest");
             try
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisterServerParams.cs b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisterServerParams.cs
index e2d30d77..86c51d48 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisterServerParams.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisterServerParams.cs
@@ -73,9 +73,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Cms.Contracts
     }
 
     /// <summary>
-    /// Paramaters to list a Registered Server from CMS tree
+    /// Paramaters to list a Registered Servers from CMS tree
     /// </summary>
-    public class ListRegisteredServerParams
+    public class ListRegisteredServersParams
     {
         public string ParentOwnerUri { get; set; }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
index 80f53bd5..54c21ac2 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
@@ -16,8 +16,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Cms.Contracts
 
     public class ListRegisteredServersRequest
     {
-        public static readonly RequestType<ListRegisteredServerParams, ListRegisteredServersResult> Type =
-            RequestType<ListRegisteredServerParams, ListRegisteredServersResult>.Create("cms/listRegisteredServers");
+        public static readonly RequestType<ListRegisteredServersParams, ListRegisteredServersResult> Type =
+            RequestType<ListRegisteredServersParams, ListRegisteredServersResult>.Create("cms/listRegisteredServers");
     }
 
     public class AddRegisteredServerRequest
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs
index c86f552c..dadf43c9 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Cms/CmsServiceTests.cs
@@ -85,7 +85,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Cms
             var requestContext2 = new Mock<RequestContext<ListRegisteredServersResult>>();
             requestContext2.Setup((RequestContext<ListRegisteredServersResult> x) => x.SendResult(It.Is<ListRegisteredServersResult>((listCmsServersResult) => listCmsServersResult.RegisteredServersList.Find(p => p.Name.Contains(name)) != null))).Returns(Task.FromResult(new object()));
 
-            ListRegisteredServerParams listServersParams = new ListRegisteredServerParams
+            ListRegisteredServersParams listServersParams = new ListRegisteredServersParams
             {
                 ParentOwnerUri = connectParams.OwnerUri,
                 RelativePath = "RegisteredServersStore/ServerGroup[@Name='DatabaseEngineServerGroup']"
@@ -141,7 +141,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Cms
             // prepare for Server group list
             var requestContext2 = new Mock<RequestContext<ListRegisteredServersResult>>();
             requestContext2.Setup((RequestContext<ListRegisteredServersResult> x) => x.SendResult(It.Is<ListRegisteredServersResult>((listCmsServersResult) => listCmsServersResult.RegisteredServerGroups.Find(p => p.Name.Contains(name)) != null))).Returns(Task.FromResult(new object()));
-            ListRegisteredServerParams listServersParams = new ListRegisteredServerParams
+            ListRegisteredServersParams listServersParams = new ListRegisteredServersParams
             {
                 ParentOwnerUri = connectParams.OwnerUri,
                 RelativePath = null
@@ -215,7 +215,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Cms
             var requestContextList2 = new Mock<RequestContext<ListRegisteredServersResult>>();
             requestContextList2.Setup((RequestContext<ListRegisteredServersResult> x) => x.SendResult(It.Is<ListRegisteredServersResult>((listCmsServersResult) => listCmsServersResult.RegisteredServerGroups.Find(p => p.Name.Contains(name + "_level3")) == null))).Returns(Task.FromResult(new object()));
 
-            ListRegisteredServerParams listServersParams = new ListRegisteredServerParams
+            ListRegisteredServersParams listServersParams = new ListRegisteredServersParams
             {
                 ParentOwnerUri = connectParams.OwnerUri,
                 RelativePath = string.Format("RegisteredServersStore/ServerGroup[@Name='DatabaseEngineServerGroup']/ServerGroup[@Name='{0}']/ServerGroup[@Name='{1}']", name + "_level1", name + "_level2") // parent URN