diff --git a/src/SharpCompress/Common/Rar/RarRijndael.cs b/src/SharpCompress/Common/Rar/RarRijndael.cs
index 83fd4958..824cb64e 100644
--- a/src/SharpCompress/Common/Rar/RarRijndael.cs
+++ b/src/SharpCompress/Common/Rar/RarRijndael.cs
@@ -4,8 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Parameters;
+using SharpCompress.Crypto;
 
 namespace SharpCompress.Common.Rar
 {
diff --git a/src/SharpCompress/Crypto/CryptoException.cs b/src/SharpCompress/Crypto/CryptoException.cs
index 7eb42a74..6e8b9f14 100644
--- a/src/SharpCompress/Crypto/CryptoException.cs
+++ b/src/SharpCompress/Crypto/CryptoException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Org.BouncyCastle.Crypto
+namespace SharpCompress.Crypto
 {
     public class CryptoException
         : Exception
diff --git a/src/SharpCompress/Crypto/DataLengthException.cs b/src/SharpCompress/Crypto/DataLengthException.cs
index 8a3e1c47..b82a9e9c 100644
--- a/src/SharpCompress/Crypto/DataLengthException.cs
+++ b/src/SharpCompress/Crypto/DataLengthException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Org.BouncyCastle.Crypto
+namespace SharpCompress.Crypto
 {
     public class DataLengthException
         : CryptoException
diff --git a/src/SharpCompress/Crypto/IBlockCipher.cs b/src/SharpCompress/Crypto/IBlockCipher.cs
index a4f30012..6f6542e3 100644
--- a/src/SharpCompress/Crypto/IBlockCipher.cs
+++ b/src/SharpCompress/Crypto/IBlockCipher.cs
@@ -1,4 +1,4 @@
-namespace Org.BouncyCastle.Crypto
+namespace SharpCompress.Crypto
 {
     /// <remarks>Base interface for a symmetric key block cipher.</remarks>
     public interface IBlockCipher
diff --git a/src/SharpCompress/Crypto/ICipherParameters.cs b/src/SharpCompress/Crypto/ICipherParameters.cs
index 16439a25..d6e4af8b 100644
--- a/src/SharpCompress/Crypto/ICipherParameters.cs
+++ b/src/SharpCompress/Crypto/ICipherParameters.cs
@@ -1,4 +1,4 @@
-namespace Org.BouncyCastle.Crypto
+namespace SharpCompress.Crypto
 {
     public interface ICipherParameters
     {
diff --git a/src/SharpCompress/Crypto/KeyParameter.cs b/src/SharpCompress/Crypto/KeyParameter.cs
index b69ce4e1..8658fc9c 100644
--- a/src/SharpCompress/Crypto/KeyParameter.cs
+++ b/src/SharpCompress/Crypto/KeyParameter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Org.BouncyCastle.Crypto.Parameters
+namespace SharpCompress.Crypto
 {
     public class KeyParameter
         : ICipherParameters
diff --git a/src/SharpCompress/Crypto/RijndaelEngine.cs b/src/SharpCompress/Crypto/RijndaelEngine.cs
index f90be37f..06e2bbdd 100644
--- a/src/SharpCompress/Crypto/RijndaelEngine.cs
+++ b/src/SharpCompress/Crypto/RijndaelEngine.cs
@@ -1,7 +1,6 @@
 using System;
-using Org.BouncyCastle.Crypto.Parameters;
 
-namespace Org.BouncyCastle.Crypto.Engines
+namespace SharpCompress.Crypto
 {
     public class RijndaelEngine
         : IBlockCipher