diff --git a/PInvoke/ComCtl32/CommCtrl.ImageList.cs b/PInvoke/ComCtl32/CommCtrl.ImageList.cs
index 5b06eeff..c710c734 100644
--- a/PInvoke/ComCtl32/CommCtrl.ImageList.cs
+++ b/PInvoke/ComCtl32/CommCtrl.ImageList.cs
@@ -1557,7 +1557,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Safe image list handle. Be aware that if this is instantiated with ownership of the handle, it will be destroyed on disposal.
 		/// </summary>
-		public class SafeHIMAGELIST : HANDLE
+		public class SafeHIMAGELIST : SafeHANDLE
 		{
 			private IImageList iImageList;
 
diff --git a/PInvoke/ComCtl32/CommCtrl.PropSheet.cs b/PInvoke/ComCtl32/CommCtrl.PropSheet.cs
index 4892d9bc..5673976c 100644
--- a/PInvoke/ComCtl32/CommCtrl.PropSheet.cs
+++ b/PInvoke/ComCtl32/CommCtrl.PropSheet.cs
@@ -920,7 +920,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HPROPSHEETPAGE instance at disposal using DestroyPropertySheetPage.</summary>
-		public class SafeHPROPSHEETPAGE : HANDLE
+		public class SafeHPROPSHEETPAGE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HPROPSHEETPAGE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/ComCtl32/dpa_dsa.cs b/PInvoke/ComCtl32/dpa_dsa.cs
index 4fd7f8aa..68c65294 100644
--- a/PInvoke/ComCtl32/dpa_dsa.cs
+++ b/PInvoke/ComCtl32/dpa_dsa.cs
@@ -1404,7 +1404,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HDPA instance at disposal using DPA_Destroy.</summary>
-		public class SafeHDPA : HANDLE
+		public class SafeHDPA : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HDPA"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1425,7 +1425,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HDSA instance at disposal using DSA_Destroy.</summary>
-		public class SafeHDSA : HANDLE
+		public class SafeHDSA : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HDSA"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Cryptography/BCrypt/BCrypt.cs b/PInvoke/Cryptography/BCrypt/BCrypt.cs
index 293f4b93..b9324a1d 100644
--- a/PInvoke/Cryptography/BCrypt/BCrypt.cs
+++ b/PInvoke/Cryptography/BCrypt/BCrypt.cs
@@ -9818,7 +9818,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="BCRYPT_ALG_HANDLE"/> that is disposed using <see cref="BCryptCloseAlgorithmProvider"/>.</summary>
-		public class SafeBCRYPT_ALG_HANDLE : HANDLE
+		public class SafeBCRYPT_ALG_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeBCRYPT_ALG_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -9845,7 +9845,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="BCRYPT_HASH_HANDLE"/> that is disposed using <see cref="BCryptDestroyHash"/>.</summary>
-		public class SafeBCRYPT_HASH_HANDLE : HANDLE
+		public class SafeBCRYPT_HASH_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeBCRYPT_HASH_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -9867,7 +9867,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="BCRYPT_KEY_HANDLE"/> that is disposed using <see cref="BCryptDestroyKey"/>.</summary>
-		public class SafeBCRYPT_KEY_HANDLE : HANDLE
+		public class SafeBCRYPT_KEY_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeBCRYPT_KEY_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -9889,7 +9889,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="BCRYPT_SECRET_HANDLE"/> that is disposed using <see cref="BCryptDestroySecret"/>.</summary>
-		public class SafeBCRYPT_SECRET_HANDLE : HANDLE
+		public class SafeBCRYPT_SECRET_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeBCRYPT_SECRET_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -9911,7 +9911,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCryptBuffer"/> that is disposed using <see cref="BCryptFreeBuffer"/>.</summary>
-		public class SafeBCryptBuffer : HANDLE
+		public class SafeBCryptBuffer : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeBCryptBuffer"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Cryptography/NCrypt/NCrypt.cs b/PInvoke/Cryptography/NCrypt/NCrypt.cs
index 757190bc..5bf7a031 100644
--- a/PInvoke/Cryptography/NCrypt/NCrypt.cs
+++ b/PInvoke/Cryptography/NCrypt/NCrypt.cs
@@ -3182,7 +3182,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCRYPT_KEY_HANDLE"/> that is disposed using <see cref="NCryptFreeObject"/>.</summary>
-		public class SafeNCRYPT_KEY_HANDLE : HANDLE
+		public class SafeNCRYPT_KEY_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNCRYPT_KEY_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -3209,7 +3209,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCRYPT_PROV_HANDLE"/> that is disposed using <see cref="NCryptFreeObject"/>.</summary>
-		public class SafeNCRYPT_PROV_HANDLE : HANDLE
+		public class SafeNCRYPT_PROV_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNCRYPT_PROV_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -3236,7 +3236,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCRYPT_SECRET_HANDLE"/> that is disposed using <see cref="NCryptFreeObject"/>.</summary>
-		public class SafeNCRYPT_SECRET_HANDLE : HANDLE
+		public class SafeNCRYPT_SECRET_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNCRYPT_SECRET_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Cryptography/NCrypt/NCryptProtect.cs b/PInvoke/Cryptography/NCrypt/NCryptProtect.cs
index f3a65744..46c03c15 100644
--- a/PInvoke/Cryptography/NCrypt/NCryptProtect.cs
+++ b/PInvoke/Cryptography/NCrypt/NCryptProtect.cs
@@ -1444,7 +1444,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCRYPT_DESCRIPTOR_HANDLE"/> that is disposed using <see cref="NCryptCloseProtectionDescriptor"/>.</summary>
-		public class SafeNCRYPT_DESCRIPTOR_HANDLE : HANDLE
+		public class SafeNCRYPT_DESCRIPTOR_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNCRYPT_DESCRIPTOR_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1466,7 +1466,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="NCRYPT_STREAM_HANDLE"/> that is disposed using <see cref="NCryptStreamClose"/>.</summary>
-		public class SafeNCRYPT_STREAM_HANDLE : HANDLE
+		public class SafeNCRYPT_STREAM_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNCRYPT_STREAM_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Gdi32/WinGdi.Metafile.cs b/PInvoke/Gdi32/WinGdi.Metafile.cs
index 70ea7ca3..f4227e7e 100644
--- a/PInvoke/Gdi32/WinGdi.Metafile.cs
+++ b/PInvoke/Gdi32/WinGdi.Metafile.cs
@@ -136,7 +136,7 @@ namespace Vanara.PInvoke
 		public static extern SafeHENHMETAFILE GetEnhMetaFile(string lpName);
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HENHMETAFILE"/> that is disposed using <see cref="DeleteEnhMetaFile"/>.</summary>
-		public class SafeHENHMETAFILE : HANDLE
+		public class SafeHENHMETAFILE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHENHMETAFILE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Gdi32/WinGdi.SafeDCHandles.cs b/PInvoke/Gdi32/WinGdi.SafeDCHandles.cs
index bfa79e76..9cd9417a 100644
--- a/PInvoke/Gdi32/WinGdi.SafeDCHandles.cs
+++ b/PInvoke/Gdi32/WinGdi.SafeDCHandles.cs
@@ -56,7 +56,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="System.Runtime.InteropServices.SafeHandle"/> to a graphics bitmap object that releases a created HBITMAP instance at disposal using DeleteObject.
 		/// </summary>
-		public class SafeHBITMAP : HANDLE
+		public class SafeHBITMAP : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHBITMAP"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -84,7 +84,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a graphics bitmap object that releases a created HBRUSH instance at disposal using DeleteObject.
 		/// </summary>
-		public class SafeHBRUSH : HANDLE
+		public class SafeHBRUSH : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHBRUSH"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -110,7 +110,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>A SafeHandle to track DC handles.</summary>
-		public class SafeHDC : HANDLE
+		public class SafeHDC : SafeHANDLE
 		{
 			private readonly IDeviceContext idc;
 
@@ -173,7 +173,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a graphics bitmap object that releases a created HFONT instance at disposal using DeleteObject.
 		/// </summary>
-		public class SafeHFONT : HANDLE
+		public class SafeHFONT : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHFONT"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -202,7 +202,7 @@ namespace Vanara.PInvoke
 		/// Provides a <see cref="SafeHandle"/> to a graphics color palette object that releases a created HPALETTE instance at disposal
 		/// using DeleteObject.
 		/// </summary>
-		public class SafeHPALETTE : HANDLE
+		public class SafeHPALETTE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHPALETTE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -230,7 +230,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a graphics bitmap object that releases a created HPEN instance at disposal using DeleteObject.
 		/// </summary>
-		public class SafeHPEN : HANDLE
+		public class SafeHPEN : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHPEN"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -258,7 +258,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a graphics bitmap object that releases a created HRGN instance at disposal using DeleteObject.
 		/// </summary>
-		public class SafeHRGN : HANDLE
+		public class SafeHRGN : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHRGN"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Kernel32/FileApi.cs b/PInvoke/Kernel32/FileApi.cs
index 8f7a8faf..3de0e541 100644
--- a/PInvoke/Kernel32/FileApi.cs
+++ b/PInvoke/Kernel32/FileApi.cs
@@ -3963,7 +3963,7 @@ namespace Vanara.PInvoke
 		/// FindFirstFileNameTransactedW, FindFirstFileTransacted, FindFirstStreamTransactedW, or FindFirstStreamW functions.
 		/// </summary>
 		/// <seealso cref="Vanara.InteropServices.GenericSafeHandle"/>
-		public class SafeSearchHandle : HANDLE
+		public class SafeSearchHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeSearchHandle"/> class.</summary>
 			/// <param name="handle">The handle.</param>
@@ -3977,7 +3977,7 @@ namespace Vanara.PInvoke
 
 		/// <summary>Represents a self-closing volume search handle opened by the FindFirstVolume.</summary>
 		/// <seealso cref="Vanara.InteropServices.GenericSafeHandle"/>
-		public class SafeVolumeSearchHandle : HANDLE
+		public class SafeVolumeSearchHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeVolumeSearchHandle"/> class.</summary>
 			/// <param name="handle">The handle.</param>
diff --git a/PInvoke/Kernel32/HandleApi.cs b/PInvoke/Kernel32/HandleApi.cs
index 96b3852d..95fa00b3 100644
--- a/PInvoke/Kernel32/HandleApi.cs
+++ b/PInvoke/Kernel32/HandleApi.cs
@@ -246,12 +246,12 @@ namespace Vanara.PInvoke
 		public static extern bool SetHandleInformation([In] IntPtr hObject, HANDLE_FLAG dwMask, HANDLE_FLAG dwFlags);
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a handle that releases a created HANDLE instance at disposal using CloseHandle.</summary>
-		public abstract class SafeKernelHandle : HANDLE, IKernelHandle
+		public abstract class SafeKernelHandle : SafeHANDLE, IKernelHandle
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeSyncHandle"/> class.</summary>
 			protected SafeKernelHandle() : base() { }
 
-			/// <summary>Initializes a new instance of the <see cref="HANDLE"/> class and assigns an existing handle.</summary>
+			/// <summary>Initializes a new instance of the <see cref="SafeHANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
 			/// <param name="ownsHandle"><see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).</param>
 			protected SafeKernelHandle(IntPtr preexistingHandle, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) { }
diff --git a/PInvoke/Kernel32/HeapApi.cs b/PInvoke/Kernel32/HeapApi.cs
index 675342b9..a75cce67 100644
--- a/PInvoke/Kernel32/HeapApi.cs
+++ b/PInvoke/Kernel32/HeapApi.cs
@@ -1078,7 +1078,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a handle to a heap.</summary>
-		public class HHEAP : HANDLE
+		public class HHEAP : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HHEAP"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Kernel32/LibLoaderApi.cs b/PInvoke/Kernel32/LibLoaderApi.cs
index d2a343ff..72d25129 100644
--- a/PInvoke/Kernel32/LibLoaderApi.cs
+++ b/PInvoke/Kernel32/LibLoaderApi.cs
@@ -1910,7 +1910,7 @@ namespace Vanara.PInvoke
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HINSTANCE instance at disposal using FreeLibrary.</summary>
 		[PInvokeData("LibLoaderAPI.h")]
-		public class SafeHINSTANCE : HANDLE
+		public class SafeHINSTANCE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HINSTANCE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1948,7 +1948,7 @@ namespace Vanara.PInvoke
 
 		/// <summary>Represents a loaded resource handle.</summary>
 		/// <seealso cref="Vanara.InteropServices.GenericSafeHandle"/>
-		public class SafeResourceDataHandle : HANDLE
+		public class SafeResourceDataHandle : SafeHANDLE
 		{
 			private IntPtr bptr;
 
@@ -1965,7 +1965,7 @@ namespace Vanara.PInvoke
 
 		/// <summary>Represents a resource data block handle.</summary>
 		/// <seealso cref="Vanara.InteropServices.GenericSafeHandle"/>
-		public class SafeResourceHandle : HANDLE
+		public class SafeResourceHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeResourceHandle"/> class.</summary>
 			public SafeResourceHandle() : base() { }
diff --git a/PInvoke/Kernel32/MemoryApi.cs b/PInvoke/Kernel32/MemoryApi.cs
index 821b623b..26563773 100644
--- a/PInvoke/Kernel32/MemoryApi.cs
+++ b/PInvoke/Kernel32/MemoryApi.cs
@@ -2711,7 +2711,7 @@ namespace Vanara.PInvoke
 		// ParameterCount );
 		[DllImport(Lib.Kernel32, SetLastError = true, ExactSpelling = true)]
 		[PInvokeData("memoryapi.h", MSDNShortId = "5021062F-E414-49A1-8B70-BE2A57A90E54")]
-		public static extern IntPtr VirtualAlloc2(HANDLE Process, IntPtr BaseAddress, SizeT Size, MEM_ALLOCATION_TYPE AllocationType, MEM_PROTECTION PageProtection, MEM_EXTENDED_PARAMETER[] ExtendedParameters, uint ParameterCount);
+		public static extern IntPtr VirtualAlloc2(SafeHANDLE Process, IntPtr BaseAddress, SizeT Size, MEM_ALLOCATION_TYPE AllocationType, MEM_PROTECTION PageProtection, MEM_EXTENDED_PARAMETER[] ExtendedParameters, uint ParameterCount);
 
 		/// <summary>
 		/// <para>
@@ -2952,7 +2952,7 @@ namespace Vanara.PInvoke
 		// *ExtendedParameters, ULONG ParameterCount );
 		[DllImport(Lib.Kernel32, SetLastError = true, ExactSpelling = true)]
 		[PInvokeData("memoryapi.h", MSDNShortId = "84896A75-A917-4CA1-A417-650428E1FBFD")]
-		public static extern IntPtr VirtualAlloc2FromApp(HANDLE Process, IntPtr BaseAddress, SizeT Size, MEM_ALLOCATION_TYPE AllocationType, MEM_PROTECTION PageProtection, MEM_EXTENDED_PARAMETER[] ExtendedParameters, uint ParameterCount);
+		public static extern IntPtr VirtualAlloc2FromApp(SafeHANDLE Process, IntPtr BaseAddress, SizeT Size, MEM_ALLOCATION_TYPE AllocationType, MEM_PROTECTION PageProtection, MEM_EXTENDED_PARAMETER[] ExtendedParameters, uint ParameterCount);
 
 		/// <summary>
 		/// <para>
diff --git a/PInvoke/Kernel32/NameSpaceApi.cs b/PInvoke/Kernel32/NameSpaceApi.cs
index af2337ad..7ce928c9 100644
--- a/PInvoke/Kernel32/NameSpaceApi.cs
+++ b/PInvoke/Kernel32/NameSpaceApi.cs
@@ -234,7 +234,7 @@ namespace Vanara.PInvoke
 		/// Provides a <see cref="SafeHandle"/> to a boundary descriptor that releases a created BoundaryDescriptorHandle instance at
 		/// disposal using DeleteBoundaryDescriptor.
 		/// </summary>
-		public class SafeBoundaryDescriptorHandle : HANDLE
+		public class SafeBoundaryDescriptorHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="BoundaryDescriptorHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -256,7 +256,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created NamespaceHandle instance at disposal using CloseHandle.</summary>
-		public class SafeNamespaceHandle : HANDLE
+		public class SafeNamespaceHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="NamespaceHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Kernel32/SynchApi.cs b/PInvoke/Kernel32/SynchApi.cs
index 374493a4..8e0a98da 100644
--- a/PInvoke/Kernel32/SynchApi.cs
+++ b/PInvoke/Kernel32/SynchApi.cs
@@ -2239,7 +2239,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a wait handle created by RegisterWaitForSingleObject and closed on disposal by UnregisterWaitEx.
 		/// </summary>
-		public class SafeRegisteredWaitHandle : HANDLE
+		public class SafeRegisteredWaitHandle : SafeHANDLE
 		{
 			private static readonly SafeEventHandle invalidEvent = new SafeEventHandle(new IntPtr(-1), false);
 
diff --git a/PInvoke/Kernel32/ThreadPoolLegacyApiSet.cs b/PInvoke/Kernel32/ThreadPoolLegacyApiSet.cs
index 161b6da5..9fc39d5e 100644
--- a/PInvoke/Kernel32/ThreadPoolLegacyApiSet.cs
+++ b/PInvoke/Kernel32/ThreadPoolLegacyApiSet.cs
@@ -559,7 +559,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a timer queue that releases a created TimerQueueHandle instance at disposal using CloseHandle.
 		/// </summary>
-		public class SafeTimerQueueHandle : HANDLE
+		public class SafeTimerQueueHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="TimerQueueHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -583,7 +583,7 @@ namespace Vanara.PInvoke
 		/// Provides a <see cref="SafeHandle"/> to a timer queue timer that releases a created TimerQueueTimerHandle instance at disposal
 		/// using DeleteTimerQueueTimer.
 		/// </summary>
-		public class SafeTimerQueueTimerHandle : HANDLE
+		public class SafeTimerQueueTimerHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="TimerQueueTimerHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Kernel32/WinBase.App.cs b/PInvoke/Kernel32/WinBase.App.cs
index f659ab0b..60312008 100644
--- a/PInvoke/Kernel32/WinBase.App.cs
+++ b/PInvoke/Kernel32/WinBase.App.cs
@@ -1078,7 +1078,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to an account context that releases a created HACTCTX instance at disposal using ReleaseActCtx.</summary>
-		public class SafeHACTCTX : HANDLE
+		public class SafeHACTCTX : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HACTCTX"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Kernel32/WinBase.File.cs b/PInvoke/Kernel32/WinBase.File.cs
index 5de7ba1f..68552396 100644
--- a/PInvoke/Kernel32/WinBase.File.cs
+++ b/PInvoke/Kernel32/WinBase.File.cs
@@ -3799,7 +3799,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Represents a search handle used in a subsequent call to the <c>FindNextVolumeMountPoint</c> and retrieved by <c>FindFirstVolumeMountPoint</c>.</summary>
-		public class SafeVolumeMountPointHandle : HANDLE
+		public class SafeVolumeMountPointHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeVolumeMountPointHandle"/> class.</summary>
 			/// <param name="handle">The handle.</param>
diff --git a/PInvoke/Kernel32/WinBase.cs b/PInvoke/Kernel32/WinBase.cs
index f275a32d..ec58c6d0 100644
--- a/PInvoke/Kernel32/WinBase.cs
+++ b/PInvoke/Kernel32/WinBase.cs
@@ -7648,7 +7648,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a UMS completion list that releases a created UmsCompletionList instance at disposal using DeleteUmsCompletionList.
 		/// </summary>
-		public class SafePUMS_COMPLETION_LIST : HANDLE
+		public class SafePUMS_COMPLETION_LIST : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafePUMS_COMPLETION_LIST"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -7667,7 +7667,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a UMS thread context that releases a created UmsThreadContext instance at disposal using DeleteUmsThreadContext.
 		/// </summary>
-		public class SafePUMS_CONTEXT : HANDLE
+		public class SafePUMS_CONTEXT : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafePUMS_CONTEXT"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Mpr/Winnetwk.cs b/PInvoke/Mpr/Winnetwk.cs
index 19c20870..5db21ea5 100644
--- a/PInvoke/Mpr/Winnetwk.cs
+++ b/PInvoke/Mpr/Winnetwk.cs
@@ -3256,7 +3256,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a WNet enumeration that releases a created WNetEnumHandle instance at disposal using WNetCloseEnum.</summary>
-		public class SafeWNetEnumHandle : HANDLE
+		public class SafeWNetEnumHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeWNetEnumHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/NTDSApi/NTDSAPI.cs b/PInvoke/NTDSApi/NTDSAPI.cs
index 5088a30d..ce08f976 100644
--- a/PInvoke/NTDSApi/NTDSAPI.cs
+++ b/PInvoke/NTDSApi/NTDSAPI.cs
@@ -5144,7 +5144,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to an authentication identity that releases its handle at disposal using DsFreePasswordCredentials.</summary>
-		public class SafeAuthIdentityHandle : HANDLE
+		public class SafeAuthIdentityHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeAuthIdentityHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -5191,7 +5191,7 @@ namespace Vanara.PInvoke
 		/// <seealso cref="Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid"/>
 		[SuppressUnmanagedCodeSecurity, ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
 		[PInvokeData("NTDSApi.h")]
-		public class SafeDsHandle : HANDLE
+		public class SafeDsHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeDsHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -5248,7 +5248,7 @@ namespace Vanara.PInvoke
 
 		/// <summary>A <see cref="SafeHandle"/> for the results from <see cref="DsReplicaGetInfo2W(SafeDsHandle, DS_REPL_INFO_TYPE, string, Guid?, string, string, DsReplInfoFlags, uint, out SafeDsReplicaInfo)"/>.</summary>
 		[PInvokeData("NTDSApi.h")]
-		public class SafeDsReplicaInfo : HANDLE
+		public class SafeDsReplicaInfo : SafeHANDLE
 		{
 			internal SafeDsReplicaInfo()
 			{
diff --git a/PInvoke/NTDll/NTDll.cs b/PInvoke/NTDll/NTDll.cs
index c53464ef..be4d146b 100644
--- a/PInvoke/NTDll/NTDll.cs
+++ b/PInvoke/NTDll/NTDll.cs
@@ -4135,7 +4135,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to an object that releases a created handle at disposal using NtClose.</summary>
-		public abstract class SafeNtHandle : HANDLE
+		public abstract class SafeNtHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNtHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/NetApi32/DsGetDC.cs b/PInvoke/NetApi32/DsGetDC.cs
index 04f963dc..3f3b45d3 100644
--- a/PInvoke/NetApi32/DsGetDC.cs
+++ b/PInvoke/NetApi32/DsGetDC.cs
@@ -1277,7 +1277,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a domain controller enumeration handle that is released at disposal using DsGetDcClose.
 		/// </summary>
-		public class SafeDCEnumHandle : HANDLE
+		public class SafeDCEnumHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeDCEnumHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/NetApi32/DsRole.cs b/PInvoke/NetApi32/DsRole.cs
index 068674eb..8b398912 100644
--- a/PInvoke/NetApi32/DsRole.cs
+++ b/PInvoke/NetApi32/DsRole.cs
@@ -296,7 +296,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a buffer that releases a created handle at disposal using DsRoleFreeMemory.</summary>
-		public class SafeDcRoleBuffer : HANDLE
+		public class SafeDcRoleBuffer : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeDcRoleBuffer"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/NetApi32/Lm.cs b/PInvoke/NetApi32/Lm.cs
index 3dbf3429..521c73c2 100644
--- a/PInvoke/NetApi32/Lm.cs
+++ b/PInvoke/NetApi32/Lm.cs
@@ -2317,7 +2317,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a buffer that releases a created handle at disposal using NetApiBufferFree.</summary>
-		public class SafeNetApiBuffer : HANDLE
+		public class SafeNetApiBuffer : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeNetApiBuffer"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Ole/OleAut32/OleAuto.SAFEARRAY.cs b/PInvoke/Ole/OleAut32/OleAuto.SAFEARRAY.cs
index 9488c457..4444efd2 100644
--- a/PInvoke/Ole/OleAut32/OleAuto.SAFEARRAY.cs
+++ b/PInvoke/Ole/OleAut32/OleAuto.SAFEARRAY.cs
@@ -1445,7 +1445,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a safe array that releases a created SAFEARRAY instance at disposal using SafeArrayDestroy.</summary>
-		public class SafeSAFEARRAY : HANDLE
+		public class SafeSAFEARRAY : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeSAFEARRAY"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Security/AdvApi32/NTSecApi.cs b/PInvoke/Security/AdvApi32/NTSecApi.cs
index f46dc97a..cf7e7c58 100644
--- a/PInvoke/Security/AdvApi32/NTSecApi.cs
+++ b/PInvoke/Security/AdvApi32/NTSecApi.cs
@@ -1852,7 +1852,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a LSA handle that releases a created LSA_HANDLE instance at disposal using LsaClose.
 		/// </summary>
-		public class SafeLSA_HANDLE : HANDLE
+		public class SafeLSA_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="LSA_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1876,7 +1876,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a LSA memory handle that releases a created LsaMemoryHandle instance at disposal using LsaFreeMemory.
 		/// </summary>
-		public class SafeLsaMemoryHandle : HANDLE
+		public class SafeLsaMemoryHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeLsaMemoryHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1893,7 +1893,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>A <see cref="SafeHandle"/> for values that must be freed using the <see cref="LsaFreeReturnBuffer(IntPtr)"/> function.</summary>
-		public sealed class SafeLsaReturnBufferHandle : HANDLE
+		public sealed class SafeLsaReturnBufferHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeLsaReturnBufferHandle"/> class.</summary>
 			/// <param name="preexistingHandle">The pointer to the memory allocated by an Lsa function.</param>
diff --git a/PInvoke/Security/AdvApi32/SecurityBaseApi.SID.cs b/PInvoke/Security/AdvApi32/SecurityBaseApi.SID.cs
index a80b0565..49a823e6 100644
--- a/PInvoke/Security/AdvApi32/SecurityBaseApi.SID.cs
+++ b/PInvoke/Security/AdvApi32/SecurityBaseApi.SID.cs
@@ -187,7 +187,7 @@ namespace Vanara.PInvoke
 		public static extern bool IsValidSid(PSID pSid);
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to an allocated SID that is released at disposal using FreeSid.</summary>
-		public class SafeAllocatedSID : HANDLE, ISecurityObject
+		public class SafeAllocatedSID : SafeHANDLE, ISecurityObject
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeAllocatedSID"/> class.</summary>
 			private SafeAllocatedSID() : base() { }
diff --git a/PInvoke/Security/AdvApi32/WinSvc.cs b/PInvoke/Security/AdvApi32/WinSvc.cs
index aa0b8ec3..f590fb31 100644
--- a/PInvoke/Security/AdvApi32/WinSvc.cs
+++ b/PInvoke/Security/AdvApi32/WinSvc.cs
@@ -2880,7 +2880,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a service that releases a created SC_HANDLE instance at disposal using CloseServiceHandle.</summary>
-		public class SafeSC_HANDLE : HANDLE
+		public class SafeSC_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SC_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Security/Authz/Authz.cs b/PInvoke/Security/Authz/Authz.cs
index 8ea45f02..02954fda 100644
--- a/PInvoke/Security/Authz/Authz.cs
+++ b/PInvoke/Security/Authz/Authz.cs
@@ -1751,7 +1751,7 @@ namespace Vanara.PInvoke
 		/// Provides a <see cref="SafeHandle"/> to a check results value that releases a created AUTHZ_ACCESS_CHECK_RESULTS_HANDLE instance
 		/// at disposal using AuthzFreeHandle.
 		/// </summary>
-		public class SafeAUTHZ_ACCESS_CHECK_RESULTS_HANDLE : HANDLE
+		public class SafeAUTHZ_ACCESS_CHECK_RESULTS_HANDLE : SafeHANDLE
 		{
 			/// <summary>
 			/// Initializes a new instance of the <see cref="AUTHZ_ACCESS_CHECK_RESULTS_HANDLE"/> class and assigns an existing handle.
@@ -1777,7 +1777,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to an audit event that releases a created AUTHZ_AUDIT_EVENT_HANDLE instance at disposal using AuthzFreeAuditEvent.
 		/// </summary>
-		public class SafeAUTHZ_AUDIT_EVENT_HANDLE : HANDLE
+		public class SafeAUTHZ_AUDIT_EVENT_HANDLE : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="AUTHZ_AUDIT_EVENT_HANDLE"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1799,7 +1799,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="AUTHZ_CLIENT_CONTEXT_HANDLE"/> that is disposed using <see cref="AuthzFreeContext"/>.</summary>
-		public class SafeAUTHZ_CLIENT_CONTEXT_HANDLE : HANDLE
+		public class SafeAUTHZ_CLIENT_CONTEXT_HANDLE : SafeHANDLE
 		{
 			/// <summary>
 			/// Initializes a new instance of the <see cref="SafeAUTHZ_CLIENT_CONTEXT_HANDLE"/> class and assigns an existing handle.
@@ -1825,7 +1825,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> for <see cref="AUTHZ_RESOURCE_MANAGER_HANDLE"/> that is disposed using <see cref="AuthzFreeResourceManager"/>.
 		/// </summary>
-		public class SafeAUTHZ_RESOURCE_MANAGER_HANDLE : HANDLE
+		public class SafeAUTHZ_RESOURCE_MANAGER_HANDLE : SafeHANDLE
 		{
 			/// <summary>
 			/// Initializes a new instance of the <see cref="SafeAUTHZ_RESOURCE_MANAGER_HANDLE"/> class and assigns an existing handle.
diff --git a/PInvoke/Security/Secur32/NTSecApi.cs b/PInvoke/Security/Secur32/NTSecApi.cs
index 095bca6c..4842cd0c 100644
--- a/PInvoke/Security/Secur32/NTSecApi.cs
+++ b/PInvoke/Security/Secur32/NTSecApi.cs
@@ -151,7 +151,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="LsaConnectionHandle"/> that is disposed using <see cref="LsaDeregisterLogonProcess"/>.</summary>
-		public class SafeLsaConnectionHandle : HANDLE
+		public class SafeLsaConnectionHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeLsaConnectionHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/Security/Secur32/Sspi.cs b/PInvoke/Security/Secur32/Sspi.cs
index 9c4d1410..69ff5dad 100644
--- a/PInvoke/Security/Secur32/Sspi.cs
+++ b/PInvoke/Security/Secur32/Sspi.cs
@@ -461,7 +461,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> for <see cref="PSEC_WINNT_AUTH_IDENTITY_OPAQUE"/> that is disposed using <see cref="SspiFreeAuthIdentity"/>.
 		/// </summary>
-		public class SafePSEC_WINNT_AUTH_IDENTITY_OPAQUE : HANDLE
+		public class SafePSEC_WINNT_AUTH_IDENTITY_OPAQUE : SafeHANDLE
 		{
 			/// <summary>
 			/// Initializes a new instance of the <see cref="SafePSEC_WINNT_AUTH_IDENTITY_OPAQUE"/> class and assigns an existing handle.
diff --git a/PInvoke/Shared/Handles.cs b/PInvoke/Shared/Handles.cs
index 7ba73d71..b99dae81 100644
--- a/PInvoke/Shared/Handles.cs
+++ b/PInvoke/Shared/Handles.cs
@@ -1883,19 +1883,19 @@ namespace Vanara.PInvoke
 	/// <seealso cref="Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid"/>
 	/// <seealso cref="System.IEquatable{T}"/>
 	/// <seealso cref="Vanara.PInvoke.IHandle"/>
-	public class HANDLE : SafeHandleZeroOrMinusOneIsInvalid, IEquatable<HANDLE>, IHandle
+	public abstract class SafeHANDLE : SafeHandleZeroOrMinusOneIsInvalid, IEquatable<SafeHANDLE>, IHandle
 	{
-		/// <summary>Initializes a new instance of the <see cref="HANDLE"/> class.</summary>
-		public HANDLE() : base(true)
+		/// <summary>Initializes a new instance of the <see cref="SafeHANDLE"/> class.</summary>
+		public SafeHANDLE() : base(true)
 		{
 		}
 
-		/// <summary>Initializes a new instance of the <see cref="HANDLE"/> class and assigns an existing handle.</summary>
+		/// <summary>Initializes a new instance of the <see cref="SafeHANDLE"/> class and assigns an existing handle.</summary>
 		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
 		/// <param name="ownsHandle">
 		/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
 		/// </param>
-		protected HANDLE(IntPtr preexistingHandle, bool ownsHandle = true) : base(ownsHandle) => SetHandle(preexistingHandle);
+		protected SafeHANDLE(IntPtr preexistingHandle, bool ownsHandle = true) : base(ownsHandle) => SetHandle(preexistingHandle);
 
 		/// <summary>Gets a value indicating whether this instance is null.</summary>
 		/// <value><c>true</c> if this instance is null; otherwise, <c>false</c>.</value>
@@ -1905,18 +1905,18 @@ namespace Vanara.PInvoke
 		/// <param name="h1">The first handle.</param>
 		/// <param name="h2">The second handle.</param>
 		/// <returns>The result of the operator.</returns>
-		public static bool operator !=(HANDLE h1, HANDLE h2) => !(h1 == h2);
+		public static bool operator !=(SafeHANDLE h1, SafeHANDLE h2) => !(h1 == h2);
 
 		/// <summary>Implements the operator ==.</summary>
 		/// <param name="h1">The first handle.</param>
 		/// <param name="h2">The second handle.</param>
 		/// <returns>The result of the operator.</returns>
-		public static bool operator ==(HANDLE h1, HANDLE h2) => h1 is null || h2 is null ? false : h1.Equals(h2);
+		public static bool operator ==(SafeHANDLE h1, SafeHANDLE h2) => h1 is null || h2 is null ? false : h1.Equals(h2);
 
-		/// <summary>Determines whether the specified <see cref="HANDLE"/>, is equal to this instance.</summary>
-		/// <param name="other">The <see cref="HANDLE"/> to compare with this instance.</param>
-		/// <returns><c>true</c> if the specified <see cref="HANDLE"/> is equal to this instance; otherwise, <c>false</c>.</returns>
-		public bool Equals(HANDLE other)
+		/// <summary>Determines whether the specified <see cref="SafeHANDLE"/>, is equal to this instance.</summary>
+		/// <param name="other">The <see cref="SafeHANDLE"/> to compare with this instance.</param>
+		/// <returns><c>true</c> if the specified <see cref="SafeHANDLE"/> is equal to this instance; otherwise, <c>false</c>.</returns>
+		public bool Equals(SafeHANDLE other)
 		{
 			if (other is null)
 				return false;
@@ -1928,7 +1928,7 @@ namespace Vanara.PInvoke
 		/// <summary>Determines whether the specified <see cref="System.Object"/>, is equal to this instance.</summary>
 		/// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
 		/// <returns><c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.</returns>
-		public override bool Equals(object obj) => obj is HANDLE h ? Equals(h) : base.Equals(obj);
+		public override bool Equals(object obj) => obj is SafeHANDLE h ? Equals(h) : base.Equals(obj);
 
 		/// <summary>Returns a hash code for this instance.</summary>
 		/// <returns>A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.</returns>
@@ -1939,7 +1939,7 @@ namespace Vanara.PInvoke
 		/// zeros the handle.
 		/// </summary>
 		/// <returns><c>true</c> to indicate successful release of the handle; <c>false</c> otherwise.</returns>
-		protected virtual bool InternalReleaseHandle() => true;
+		protected abstract bool InternalReleaseHandle();
 
 		/// <inheritdoc/>
 		protected override bool ReleaseHandle()
diff --git a/PInvoke/Shell32/ShlObj.cs b/PInvoke/Shell32/ShlObj.cs
index 07c56558..909e169a 100644
--- a/PInvoke/Shell32/ShlObj.cs
+++ b/PInvoke/Shell32/ShlObj.cs
@@ -7639,7 +7639,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HPIF"/> that is disposed using <see cref="PifMgr_CloseProperties"/>.</summary>
-		public class SafeHPIF : HANDLE
+		public class SafeHPIF : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHPIF"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -7661,7 +7661,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HPSXA"/> that is disposed using <see cref="SHDestroyPropSheetExtArray"/>.</summary>
-		public class SafeHPSXA : HANDLE
+		public class SafeHPSXA : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHPSXA"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/ShlwApi/Shlwapi.cs b/PInvoke/ShlwApi/Shlwapi.cs
index 8be15899..b5af4803 100644
--- a/PInvoke/ShlwApi/Shlwapi.cs
+++ b/PInvoke/ShlwApi/Shlwapi.cs
@@ -5777,7 +5777,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HUSKEY"/> that is disposed using <see cref="SHRegCloseUSKey"/>.</summary>
-		public class SafeHUSKEY : HANDLE
+		public class SafeHUSKEY : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHUSKEY"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32.Gdi/WinUser.Cursor.cs b/PInvoke/User32.Gdi/WinUser.Cursor.cs
index 0855c9ec..36db73f9 100644
--- a/PInvoke/User32.Gdi/WinUser.Cursor.cs
+++ b/PInvoke/User32.Gdi/WinUser.Cursor.cs
@@ -775,7 +775,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a Windows that disposes a created HCURSOR instance at disposal using DestroyCursor.</summary>
-		public class SafeHCURSOR : HANDLE
+		public class SafeHCURSOR : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HCURSOR"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32.Gdi/WinUser.Desktop.cs b/PInvoke/User32.Gdi/WinUser.Desktop.cs
index 3776d3a5..ae2d0a77 100644
--- a/PInvoke/User32.Gdi/WinUser.Desktop.cs
+++ b/PInvoke/User32.Gdi/WinUser.Desktop.cs
@@ -1105,7 +1105,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HDESK instance at disposal using CloseDesktop.</summary>
-		public class SafeHDESK : HANDLE
+		public class SafeHDESK : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HDESK"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
@@ -1128,7 +1128,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a that releases a created HWINSTA instance at disposal using CloseWindowStation.</summary>
-		public class SafeHWINSTA : HANDLE
+		public class SafeHWINSTA : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HWINSTA"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32.Gdi/WinUser.Icon.cs b/PInvoke/User32.Gdi/WinUser.Icon.cs
index 26018450..f228e9ae 100644
--- a/PInvoke/User32.Gdi/WinUser.Icon.cs
+++ b/PInvoke/User32.Gdi/WinUser.Icon.cs
@@ -1140,7 +1140,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> to a Windows that disposes a created HICON instance at disposal using DestroyIcon.</summary>
-		public class SafeHICON : HANDLE
+		public class SafeHICON : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHICON"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32.Gdi/WinUser.Menu.cs b/PInvoke/User32.Gdi/WinUser.Menu.cs
index 9ccaeb67..518d1867 100644
--- a/PInvoke/User32.Gdi/WinUser.Menu.cs
+++ b/PInvoke/User32.Gdi/WinUser.Menu.cs
@@ -4045,7 +4045,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HMENU"/> that is disposed using <see cref="DestroyMenu"/>.</summary>
-		public class SafeHMENU : HANDLE
+		public class SafeHMENU : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHMENU"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32.Gdi/WinUser.Window.cs b/PInvoke/User32.Gdi/WinUser.Window.cs
index 7d216837..f3873b12 100644
--- a/PInvoke/User32.Gdi/WinUser.Window.cs
+++ b/PInvoke/User32.Gdi/WinUser.Window.cs
@@ -6011,7 +6011,7 @@ namespace Vanara.PInvoke
 		/// <summary>
 		/// Provides a <see cref="SafeHandle"/> to a window or dialog that releases a created HWND instance at disposal using DestroyWindow.
 		/// </summary>
-		public class SafeHWND : HANDLE
+		public class SafeHWND : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="HWND"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/User32/WinUser.Hook.cs b/PInvoke/User32/WinUser.Hook.cs
index 8a4451d2..60b14e0c 100644
--- a/PInvoke/User32/WinUser.Hook.cs
+++ b/PInvoke/User32/WinUser.Hook.cs
@@ -1072,7 +1072,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HHOOK"/> that is disposed using <see cref="UnhookWindowsHookEx"/>.</summary>
-		public class SafeHHOOK : HANDLE
+		public class SafeHHOOK : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHHOOK"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
diff --git a/PInvoke/UxTheme/UXTHEME.cs b/PInvoke/UxTheme/UXTHEME.cs
index 0c449f14..7d950f17 100644
--- a/PInvoke/UxTheme/UXTHEME.cs
+++ b/PInvoke/UxTheme/UXTHEME.cs
@@ -3647,7 +3647,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Represents a safe handle for a theme. Use in place of HTHEME.</summary>
-		public class SafeHTHEME : HANDLE
+		public class SafeHTHEME : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeHTHEME"/> class.</summary>
 			/// <param name="hTheme">The h theme.</param>
diff --git a/PInvoke/UxTheme/UXTHEME_BufferedPaint.cs b/PInvoke/UxTheme/UXTHEME_BufferedPaint.cs
index 4ec76c9d..a6ea3ef6 100644
--- a/PInvoke/UxTheme/UXTHEME_BufferedPaint.cs
+++ b/PInvoke/UxTheme/UXTHEME_BufferedPaint.cs
@@ -607,7 +607,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HANIMATIONBUFFER"/> that is disposed using <see cref="EndBufferedAnimation"/>.</summary>
-		public class SafeHANIMATIONBUFFER : HANDLE
+		public class SafeHANIMATIONBUFFER : SafeHANDLE
 		{
 			private readonly bool fUpdateTarget = true;
 
@@ -632,7 +632,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HPAINTBUFFER"/> that is disposed using <see cref="EndBufferedPaint"/>.</summary>
-		public class SafeHPAINTBUFFER : HANDLE
+		public class SafeHPAINTBUFFER : SafeHANDLE
 		{
 			private readonly bool fUpdateTarget = true;
 
diff --git a/PInvoke/WinINet/WinINet.cs b/PInvoke/WinINet/WinINet.cs
index beea1be1..62c8ef4d 100644
--- a/PInvoke/WinINet/WinINet.cs
+++ b/PInvoke/WinINet/WinINet.cs
@@ -1774,7 +1774,7 @@ namespace Vanara.PInvoke
 		}
 
 		/// <summary>Provides a <see cref="SafeHandle"/> that is disposed using <see cref="InternetCloseHandle"/>.</summary>
-		public class SafeInternetHandle : HANDLE
+		public class SafeInternetHandle : SafeHANDLE
 		{
 			/// <summary>Initializes a new instance of the <see cref="SafeInternetHandle"/> class and assigns an existing handle.</summary>
 			/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>