diff --git a/src/Lucene.Net/Support/IO/PosixFsyncSupport.cs b/src/Lucene.Net/Support/IO/PosixFsyncSupport.cs
index 352739ff49..d5f4098404 100644
--- a/src/Lucene.Net/Support/IO/PosixFsyncSupport.cs
+++ b/src/Lucene.Net/Support/IO/PosixFsyncSupport.cs
@@ -2,8 +2,8 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using static Lucene.Net.Support.Native.Interop.Posix;
-using static Lucene.Net.Support.Native.Interop.MacOS;
+using static Lucene.Net.Native.Interop.Posix;
+using static Lucene.Net.Native.Interop.MacOS;
 
 namespace Lucene.Net.Support.IO
 {
diff --git a/src/Lucene.Net/Support/IO/WindowsFsyncSupport.cs b/src/Lucene.Net/Support/IO/WindowsFsyncSupport.cs
index 78017a20fa..ace2ab76af 100644
--- a/src/Lucene.Net/Support/IO/WindowsFsyncSupport.cs
+++ b/src/Lucene.Net/Support/IO/WindowsFsyncSupport.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using static Lucene.Net.Support.Native.Interop.Win32;
+using static Lucene.Net.Native.Interop.Win32;
 
 namespace Lucene.Net.Support.IO
 {
diff --git a/src/Lucene.Net/Support/Native/Interop.MacOS.Constants.cs b/src/Lucene.Net/Support/Native/Interop.MacOS.Constants.cs
index b0ba4613d8..d40b745535 100644
--- a/src/Lucene.Net/Support/Native/Interop.MacOS.Constants.cs
+++ b/src/Lucene.Net/Support/Native/Interop.MacOS.Constants.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Posix.Close.cs b/src/Lucene.Net/Support/Native/Interop.Posix.Close.cs
index 009b0daf45..d4fb9a7b99 100644
--- a/src/Lucene.Net/Support/Native/Interop.Posix.Close.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Posix.Close.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Posix.Constants.cs b/src/Lucene.Net/Support/Native/Interop.Posix.Constants.cs
index d483a7d9ff..ef8c02ac36 100644
--- a/src/Lucene.Net/Support/Native/Interop.Posix.Constants.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Posix.Constants.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Posix.Fcntl.cs b/src/Lucene.Net/Support/Native/Interop.Posix.Fcntl.cs
index 42a6eb9135..a9e20d5c10 100644
--- a/src/Lucene.Net/Support/Native/Interop.Posix.Fcntl.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Posix.Fcntl.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Posix.Fsync.cs b/src/Lucene.Net/Support/Native/Interop.Posix.Fsync.cs
index f63116596d..eafb1715f0 100644
--- a/src/Lucene.Net/Support/Native/Interop.Posix.Fsync.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Posix.Fsync.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Posix.Open.cs b/src/Lucene.Net/Support/Native/Interop.Posix.Open.cs
index 0ef5b9c49e..b66409ee7c 100644
--- a/src/Lucene.Net/Support/Native/Interop.Posix.Open.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Posix.Open.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Win32.CloseHandle.cs b/src/Lucene.Net/Support/Native/Interop.Win32.CloseHandle.cs
index 9c8f56fda7..fa4dafb919 100644
--- a/src/Lucene.Net/Support/Native/Interop.Win32.CloseHandle.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Win32.CloseHandle.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Win32.Constants.cs b/src/Lucene.Net/Support/Native/Interop.Win32.Constants.cs
index 313dec7e19..2279c02c9a 100644
--- a/src/Lucene.Net/Support/Native/Interop.Win32.Constants.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Win32.Constants.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Win32.CreateFileW.cs b/src/Lucene.Net/Support/Native/Interop.Win32.CreateFileW.cs
index 8c52113dc9..e6732c0b2c 100644
--- a/src/Lucene.Net/Support/Native/Interop.Win32.CreateFileW.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Win32.CreateFileW.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net/Support/Native/Interop.Win32.FlushFileBuffers.cs b/src/Lucene.Net/Support/Native/Interop.Win32.FlushFileBuffers.cs
index ad448a9795..c47ffa95d3 100644
--- a/src/Lucene.Net/Support/Native/Interop.Win32.FlushFileBuffers.cs
+++ b/src/Lucene.Net/Support/Native/Interop.Win32.FlushFileBuffers.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Lucene.Net.Support.Native
+namespace Lucene.Net.Native
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more