diff --git a/src/code/ResponseUtilFactory.cs b/src/code/ResponseUtilFactory.cs
index dbefd95e0..3f25d63c3 100644
--- a/src/code/ResponseUtilFactory.cs
+++ b/src/code/ResponseUtilFactory.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.PowerShell.PSResourceGet.Cmdlets;
 using Microsoft.PowerShell.PSResourceGet.UtilClasses;
 
-namespace Microsoft.PowerShell.PSResourceGet
+namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
 {
-    internal class ResponseUtilFactory.Cmdlets
+    internal class ResponseUtilFactory
     {
         public static ResponseUtil GetResponseUtil(PSRepositoryInfo repository)
         {
diff --git a/src/code/SavePSResource.cs b/src/code/SavePSResource.cs
index 54f284d37..48d6f4891 100644
--- a/src/code/SavePSResource.cs
+++ b/src/code/SavePSResource.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.PowerShell.PSResourceGet.Cmdlets;
 using Microsoft.PowerShell.PSResourceGet.UtilClasses;
 using NuGet.Versioning;
 using System;
diff --git a/src/code/V3ServerAPICalls.cs b/src/code/V3ServerAPICalls.cs
index 00274e893..dec0da5ea 100644
--- a/src/code/V3ServerAPICalls.cs
+++ b/src/code/V3ServerAPICalls.cs
@@ -13,9 +13,8 @@
 using System.Threading.Tasks;
 using System.Collections;
 using System.Management.Automation;
-using Microsoft.PowerShell.PSResourceGet.Cmdlets;
 
-namespace Microsoft.PowerShell.PSResourceGet
+namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
 {
     internal class V3ServerAPICalls : ServerApiCall
     {