diff --git a/Common/Net/IP/IPHelper.cs b/Common/Net/IP/IPHelper.cs
index f1bf5d7..5b6936e 100644
--- a/Common/Net/IP/IPHelper.cs
+++ b/Common/Net/IP/IPHelper.cs
@@ -47,7 +47,7 @@ internal static string GetRealAddress(byte[] _remoteAddress)
     public static string MergePorts(IEnumerable<int> ports)
     {
         var result = "";
-        var BeginRange = -2; //-2 to make sure it never matches any starting port (0 or larger).
+        var BeginRange = -2; // -2 to make sure it never matches any starting port (0 or larger).
         var EndRange = -2; //Initialization strictly speaking not necessary, but it shuts up a compiler warning.
         foreach (var port in ports)
         {
diff --git a/Common/Net/IP/TCP/TCPHelper.NativeMethods.cs b/Common/Net/IP/TCP/NativeMethods.cs
similarity index 100%
rename from Common/Net/IP/TCP/TCPHelper.NativeMethods.cs
rename to Common/Net/IP/TCP/NativeMethods.cs
diff --git a/Common/Net/IP/UDP/UDPHelper.cs b/Common/Net/IP/UDP/UDPHelper.cs
index 92841c2..f377375 100644
--- a/Common/Net/IP/UDP/UDPHelper.cs
+++ b/Common/Net/IP/UDP/UDPHelper.cs
@@ -3,8 +3,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 
-using Wokhan.WindowsFirewallNotifier.Common.Net.IP.UDP.UDP6;
-
 using static Wokhan.WindowsFirewallNotifier.Common.Net.IP.IPHelper;
 
 namespace Wokhan.WindowsFirewallNotifier.Common.Net.IP.UDP;
@@ -53,6 +51,6 @@ internal static IEnumerable<IConnectionOwnerInfo> GetAllUDPConnections<TTable, T
     }
 
     public static IEnumerable<IConnectionOwnerInfo> GetAllUDPConnections() => GetAllUDPConnections<UDP4.MIB_UDPTABLE_OWNER_MODULE, UDP4.MIB_UDPROW_OWNER_MODULE>(AF_INET.IP4);
-    public static IEnumerable<IConnectionOwnerInfo> GetAllUDP6Connections() => GetAllUDPConnections<MIB_UDP6TABLE_OWNER_MODULE, MIB_UDP6ROW_OWNER_MODULE>(AF_INET.IP6);
+    public static IEnumerable<IConnectionOwnerInfo> GetAllUDP6Connections() => GetAllUDPConnections<UDP6.MIB_UDP6TABLE_OWNER_MODULE, UDP6.MIB_UDP6ROW_OWNER_MODULE>(AF_INET.IP6);
 
 }