diff --git a/SabreTools.Hashing/MessageDigest/Constants.cs b/SabreTools.Hashing/CryptographicHash/Constants.cs
similarity index 99%
rename from SabreTools.Hashing/MessageDigest/Constants.cs
rename to SabreTools.Hashing/CryptographicHash/Constants.cs
index 816ec33..1248c82 100644
--- a/SabreTools.Hashing/MessageDigest/Constants.cs
+++ b/SabreTools.Hashing/CryptographicHash/Constants.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     internal static class Constants
     {
diff --git a/SabreTools.Hashing/MessageDigest/MD2.cs b/SabreTools.Hashing/CryptographicHash/MD2.cs
similarity index 98%
rename from SabreTools.Hashing/MessageDigest/MD2.cs
rename to SabreTools.Hashing/CryptographicHash/MD2.cs
index 8064c53..0f32dce 100644
--- a/SabreTools.Hashing/MessageDigest/MD2.cs
+++ b/SabreTools.Hashing/CryptographicHash/MD2.cs
@@ -1,7 +1,7 @@
 using System;
-using static SabreTools.Hashing.MessageDigest.Constants;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://datatracker.ietf.org/doc/html/rfc1115"/>
     public class MD2 : MessageDigestBase<uint>
diff --git a/SabreTools.Hashing/MessageDigest/MD4.cs b/SabreTools.Hashing/CryptographicHash/MD4.cs
similarity index 98%
rename from SabreTools.Hashing/MessageDigest/MD4.cs
rename to SabreTools.Hashing/CryptographicHash/MD4.cs
index e2270eb..a06ce7c 100644
--- a/SabreTools.Hashing/MessageDigest/MD4.cs
+++ b/SabreTools.Hashing/CryptographicHash/MD4.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://datatracker.ietf.org/doc/html/rfc1320"/>
     public class MD4 : MessageDigestBase<uint>
diff --git a/SabreTools.Hashing/MessageDigest/MessageDigestBase.cs b/SabreTools.Hashing/CryptographicHash/MessageDigestBase.cs
similarity index 97%
rename from SabreTools.Hashing/MessageDigest/MessageDigestBase.cs
rename to SabreTools.Hashing/CryptographicHash/MessageDigestBase.cs
index 19366f8..483e603 100644
--- a/SabreTools.Hashing/MessageDigest/MessageDigestBase.cs
+++ b/SabreTools.Hashing/CryptographicHash/MessageDigestBase.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     public abstract class MessageDigestBase : System.Security.Cryptography.HashAlgorithm
     {
diff --git a/SabreTools.Hashing/MessageDigest/RipeMD128.cs b/SabreTools.Hashing/CryptographicHash/RipeMD128.cs
similarity index 99%
rename from SabreTools.Hashing/MessageDigest/RipeMD128.cs
rename to SabreTools.Hashing/CryptographicHash/RipeMD128.cs
index 4b33439..604a973 100644
--- a/SabreTools.Hashing/MessageDigest/RipeMD128.cs
+++ b/SabreTools.Hashing/CryptographicHash/RipeMD128.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://cdn.standards.iteh.ai/samples/39876/10f9f9f4bb614eaaaeba7e157e183ca3/ISO-IEC-10118-3-2004.pdf"/>
     /// <see href="https://homes.esat.kuleuven.be/~bosselae/ripemd160/pdf/AB-9601/AB-9601.pdf"/>
diff --git a/SabreTools.Hashing/MessageDigest/RipeMD160.cs b/SabreTools.Hashing/CryptographicHash/RipeMD160.cs
similarity index 99%
rename from SabreTools.Hashing/MessageDigest/RipeMD160.cs
rename to SabreTools.Hashing/CryptographicHash/RipeMD160.cs
index 7c0b8bc..dfe86de 100644
--- a/SabreTools.Hashing/MessageDigest/RipeMD160.cs
+++ b/SabreTools.Hashing/CryptographicHash/RipeMD160.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://cdn.standards.iteh.ai/samples/39876/10f9f9f4bb614eaaaeba7e157e183ca3/ISO-IEC-10118-3-2004.pdf"/>
     /// <see href="https://homes.esat.kuleuven.be/~bosselae/ripemd160/pdf/AB-9601/AB-9601.pdf"/>
diff --git a/SabreTools.Hashing/MessageDigest/RipeMD256.cs b/SabreTools.Hashing/CryptographicHash/RipeMD256.cs
similarity index 99%
rename from SabreTools.Hashing/MessageDigest/RipeMD256.cs
rename to SabreTools.Hashing/CryptographicHash/RipeMD256.cs
index 49e1d4b..47d2f45 100644
--- a/SabreTools.Hashing/MessageDigest/RipeMD256.cs
+++ b/SabreTools.Hashing/CryptographicHash/RipeMD256.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://cdn.standards.iteh.ai/samples/39876/10f9f9f4bb614eaaaeba7e157e183ca3/ISO-IEC-10118-3-2004.pdf"/>
     /// <see href="https://homes.esat.kuleuven.be/~bosselae/ripemd160/pdf/AB-9601/AB-9601.pdf"/>
diff --git a/SabreTools.Hashing/MessageDigest/RipeMD320.cs b/SabreTools.Hashing/CryptographicHash/RipeMD320.cs
similarity index 99%
rename from SabreTools.Hashing/MessageDigest/RipeMD320.cs
rename to SabreTools.Hashing/CryptographicHash/RipeMD320.cs
index 4bcd450..5845bbc 100644
--- a/SabreTools.Hashing/MessageDigest/RipeMD320.cs
+++ b/SabreTools.Hashing/CryptographicHash/RipeMD320.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://cdn.standards.iteh.ai/samples/39876/10f9f9f4bb614eaaaeba7e157e183ca3/ISO-IEC-10118-3-2004.pdf"/>
     /// <see href="https://homes.esat.kuleuven.be/~bosselae/ripemd160/pdf/AB-9601/AB-9601.pdf"/>
diff --git a/SabreTools.Hashing/MessageDigest/Tiger128_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger128_3.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger128_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger128_3.cs
index e035636..cc49292 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger128_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger128_3.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger-128
diff --git a/SabreTools.Hashing/MessageDigest/Tiger128_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger128_4.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger128_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger128_4.cs
index fc6c642..43c6387 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger128_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger128_4.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger-128
diff --git a/SabreTools.Hashing/MessageDigest/Tiger160_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger160_3.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger160_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger160_3.cs
index 5e120f2..b1cd623 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger160_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger160_3.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger-160
diff --git a/SabreTools.Hashing/MessageDigest/Tiger160_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger160_4.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger160_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger160_4.cs
index adf5825..c50eb9d 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger160_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger160_4.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger-160
diff --git a/SabreTools.Hashing/MessageDigest/Tiger192_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger192_3.cs
similarity index 83%
rename from SabreTools.Hashing/MessageDigest/Tiger192_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger192_3.cs
index 6d059bd..577ac29 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger192_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger192_3.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger-192
diff --git a/SabreTools.Hashing/MessageDigest/Tiger192_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger192_4.cs
similarity index 83%
rename from SabreTools.Hashing/MessageDigest/Tiger192_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger192_4.cs
index f67a8cd..533cf01 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger192_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger192_4.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger-192
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_128_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_128_3.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger2_128_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_128_3.cs
index c8014df..830ff40 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_128_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_128_3.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger2-128
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_128_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_128_4.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger2_128_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_128_4.cs
index 237e2e4..1350f07 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_128_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_128_4.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger2-128
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_160_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_160_3.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger2_160_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_160_3.cs
index 82ebb56..453ff26 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_160_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_160_3.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger2-160
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_160_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_160_4.cs
similarity index 91%
rename from SabreTools.Hashing/MessageDigest/Tiger2_160_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_160_4.cs
index 92dc49c..1acd0aa 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_160_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_160_4.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger2-160
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_192_3.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_192_3.cs
similarity index 84%
rename from SabreTools.Hashing/MessageDigest/Tiger2_192_3.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_192_3.cs
index aefe169..dc4861b 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_192_3.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_192_3.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 3-pass variant of Tiger2-192
diff --git a/SabreTools.Hashing/MessageDigest/Tiger2_192_4.cs b/SabreTools.Hashing/CryptographicHash/Tiger2_192_4.cs
similarity index 84%
rename from SabreTools.Hashing/MessageDigest/Tiger2_192_4.cs
rename to SabreTools.Hashing/CryptographicHash/Tiger2_192_4.cs
index ffe8c94..48ebfa4 100644
--- a/SabreTools.Hashing/MessageDigest/Tiger2_192_4.cs
+++ b/SabreTools.Hashing/CryptographicHash/Tiger2_192_4.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <summary>
     /// 4-pass variant of Tiger2-192
diff --git a/SabreTools.Hashing/MessageDigest/TigerHashBase.cs b/SabreTools.Hashing/CryptographicHash/TigerHashBase.cs
similarity index 98%
rename from SabreTools.Hashing/MessageDigest/TigerHashBase.cs
rename to SabreTools.Hashing/CryptographicHash/TigerHashBase.cs
index b830bf0..5eea9cf 100644
--- a/SabreTools.Hashing/MessageDigest/TigerHashBase.cs
+++ b/SabreTools.Hashing/CryptographicHash/TigerHashBase.cs
@@ -1,8 +1,8 @@
 using System;
+using static SabreTools.Hashing.CryptographicHash.Constants;
 using static SabreTools.Hashing.HashOperations;
-using static SabreTools.Hashing.MessageDigest.Constants;
 
-namespace SabreTools.Hashing.MessageDigest
+namespace SabreTools.Hashing.CryptographicHash
 {
     /// <see href="https://biham.cs.technion.ac.il/Reports/Tiger//>
     public abstract class TigerHashBase : MessageDigestBase<ulong>
diff --git a/SabreTools.Hashing/HashWrapper.cs b/SabreTools.Hashing/HashWrapper.cs
index bcc7a60..f5a3f1c 100644
--- a/SabreTools.Hashing/HashWrapper.cs
+++ b/SabreTools.Hashing/HashWrapper.cs
@@ -280,14 +280,14 @@ namespace SabreTools.Hashing
                 HashType.FNV1a_32 => new FNV1a_32(),
                 HashType.FNV1a_64 => new FNV1a_64(),
 
-                HashType.MD2 => new MessageDigest.MD2(),
-                HashType.MD4 => new MessageDigest.MD4(),
+                HashType.MD2 => new CryptographicHash.MD2(),
+                HashType.MD4 => new CryptographicHash.MD4(),
                 HashType.MD5 => MD5.Create(),
 
-                HashType.RIPEMD128 => new MessageDigest.RipeMD128(),
-                HashType.RIPEMD160 => new MessageDigest.RipeMD160(),
-                HashType.RIPEMD256 => new MessageDigest.RipeMD256(),
-                HashType.RIPEMD320 => new MessageDigest.RipeMD320(),
+                HashType.RIPEMD128 => new CryptographicHash.RipeMD128(),
+                HashType.RIPEMD160 => new CryptographicHash.RipeMD160(),
+                HashType.RIPEMD256 => new CryptographicHash.RipeMD256(),
+                HashType.RIPEMD320 => new CryptographicHash.RipeMD320(),
 
                 HashType.SHA1 => SHA1.Create(),
                 HashType.SHA256 => SHA256.Create(),
@@ -303,18 +303,18 @@ namespace SabreTools.Hashing
 
                 HashType.SpamSum => new SpamSumContext(),
 
-                HashType.Tiger128_3 => new MessageDigest.Tiger128_3(),
-                HashType.Tiger128_4 => new MessageDigest.Tiger128_4(),
-                HashType.Tiger160_3 => new MessageDigest.Tiger160_3(),
-                HashType.Tiger160_4 => new MessageDigest.Tiger160_4(),
-                HashType.Tiger192_3 => new MessageDigest.Tiger192_3(),
-                HashType.Tiger192_4 => new MessageDigest.Tiger192_4(),
-                HashType.Tiger2_128_3 => new MessageDigest.Tiger2_128_3(),
-                HashType.Tiger2_128_4 => new MessageDigest.Tiger2_128_4(),
-                HashType.Tiger2_160_3 => new MessageDigest.Tiger2_160_3(),
-                HashType.Tiger2_160_4 => new MessageDigest.Tiger2_160_4(),
-                HashType.Tiger2_192_3 => new MessageDigest.Tiger2_192_3(),
-                HashType.Tiger2_192_4 => new MessageDigest.Tiger2_192_4(),
+                HashType.Tiger128_3 => new CryptographicHash.Tiger128_3(),
+                HashType.Tiger128_4 => new CryptographicHash.Tiger128_4(),
+                HashType.Tiger160_3 => new CryptographicHash.Tiger160_3(),
+                HashType.Tiger160_4 => new CryptographicHash.Tiger160_4(),
+                HashType.Tiger192_3 => new CryptographicHash.Tiger192_3(),
+                HashType.Tiger192_4 => new CryptographicHash.Tiger192_4(),
+                HashType.Tiger2_128_3 => new CryptographicHash.Tiger2_128_3(),
+                HashType.Tiger2_128_4 => new CryptographicHash.Tiger2_128_4(),
+                HashType.Tiger2_160_3 => new CryptographicHash.Tiger2_160_3(),
+                HashType.Tiger2_160_4 => new CryptographicHash.Tiger2_160_4(),
+                HashType.Tiger2_192_3 => new CryptographicHash.Tiger2_192_3(),
+                HashType.Tiger2_192_4 => new CryptographicHash.Tiger2_192_4(),
 
                 HashType.XxHash32 => new NonCryptographicHash.XxHash32(),
                 HashType.XxHash64 => new NonCryptographicHash.XxHash64(),