diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php
index 995f6a97..6851fc2c 100644
--- a/phpseclib/Net/SFTP.php
+++ b/phpseclib/Net/SFTP.php
@@ -43,7 +43,7 @@ use phpseclib3\Net\SFTP\OpenFlag;
 use phpseclib3\Net\SFTP\OpenFlag5;
 use phpseclib3\Net\SFTP\PacketType as SftpPacketType;
 use phpseclib3\Net\SFTP\StatusCode;
-use phpseclib3\Net\Ssh2\MessageType as Ssh2MessageType;
+use phpseclib3\Net\SSH2\MessageType as Ssh2MessageType;
 
 /**
  * Pure-PHP implementations of SFTP.
diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php
index 625bd475..a7a69ae9 100644
--- a/phpseclib/Net/SFTP/Stream.php
+++ b/phpseclib/Net/SFTP/Stream.php
@@ -20,7 +20,7 @@ namespace phpseclib3\Net\SFTP;
 use phpseclib3\Crypt\Common\PrivateKey;
 use phpseclib3\Net\SFTP;
 use phpseclib3\Net\SSH2;
-use phpseclib3\Net\Ssh2\MessageType as Ssh2MessageType;
+use phpseclib3\Net\SSH2\MessageType as Ssh2MessageType;
 
 /**
  * SFTP Stream Wrapper
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index 3e3b11c0..0cc92512 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -71,11 +71,11 @@ use phpseclib3\Exception\UnableToConnectException;
 use phpseclib3\Exception\UnsupportedAlgorithmException;
 use phpseclib3\Exception\UnsupportedCurveException;
 use phpseclib3\Math\BigInteger;
-use phpseclib3\Net\Ssh2\ChannelConnectionFailureReason;
-use phpseclib3\Net\Ssh2\DisconnectReason;
-use phpseclib3\Net\Ssh2\MessageType;
-use phpseclib3\Net\Ssh2\MessageTypeExtra;
-use phpseclib3\Net\Ssh2\TerminalMode;
+use phpseclib3\Net\SSH2\ChannelConnectionFailureReason;
+use phpseclib3\Net\SSH2\DisconnectReason;
+use phpseclib3\Net\SSH2\MessageType;
+use phpseclib3\Net\SSH2\MessageTypeExtra;
+use phpseclib3\Net\SSH2\TerminalMode;
 use phpseclib3\System\SSH\Agent;
 
 /**
diff --git a/phpseclib/Net/Ssh2/ChannelConnectionFailureReason.php b/phpseclib/Net/SSH2/ChannelConnectionFailureReason.php
similarity index 87%
rename from phpseclib/Net/Ssh2/ChannelConnectionFailureReason.php
rename to phpseclib/Net/SSH2/ChannelConnectionFailureReason.php
index b4dd0835..d83453c5 100644
--- a/phpseclib/Net/Ssh2/ChannelConnectionFailureReason.php
+++ b/phpseclib/Net/SSH2/ChannelConnectionFailureReason.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace phpseclib3\Net\Ssh2;
+namespace phpseclib3\Net\SSH2;
 
 /**
  * @internal
diff --git a/phpseclib/Net/Ssh2/DisconnectReason.php b/phpseclib/Net/SSH2/DisconnectReason.php
similarity index 95%
rename from phpseclib/Net/Ssh2/DisconnectReason.php
rename to phpseclib/Net/SSH2/DisconnectReason.php
index 70f594ec..0342e72d 100644
--- a/phpseclib/Net/Ssh2/DisconnectReason.php
+++ b/phpseclib/Net/SSH2/DisconnectReason.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace phpseclib3\Net\Ssh2;
+namespace phpseclib3\Net\SSH2;
 
 use phpseclib3\Common\ConstantUtilityTrait;
 
diff --git a/phpseclib/Net/Ssh2/MessageType.php b/phpseclib/Net/SSH2/MessageType.php
similarity index 97%
rename from phpseclib/Net/Ssh2/MessageType.php
rename to phpseclib/Net/SSH2/MessageType.php
index 76980be6..9f6923fd 100644
--- a/phpseclib/Net/Ssh2/MessageType.php
+++ b/phpseclib/Net/SSH2/MessageType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace phpseclib3\Net\Ssh2;
+namespace phpseclib3\Net\SSH2;
 
 use phpseclib3\Common\ConstantUtilityTrait;
 
diff --git a/phpseclib/Net/Ssh2/MessageTypeExtra.php b/phpseclib/Net/SSH2/MessageTypeExtra.php
similarity index 94%
rename from phpseclib/Net/Ssh2/MessageTypeExtra.php
rename to phpseclib/Net/SSH2/MessageTypeExtra.php
index aac363ae..bcf4cd76 100644
--- a/phpseclib/Net/Ssh2/MessageTypeExtra.php
+++ b/phpseclib/Net/SSH2/MessageTypeExtra.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace phpseclib3\Net\Ssh2;
+namespace phpseclib3\Net\SSH2;
 
 /**
  * @internal
diff --git a/phpseclib/Net/Ssh2/TerminalMode.php b/phpseclib/Net/SSH2/TerminalMode.php
similarity index 73%
rename from phpseclib/Net/Ssh2/TerminalMode.php
rename to phpseclib/Net/SSH2/TerminalMode.php
index 23d80eb2..8e16efac 100644
--- a/phpseclib/Net/Ssh2/TerminalMode.php
+++ b/phpseclib/Net/SSH2/TerminalMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace phpseclib3\Net\Ssh2;
+namespace phpseclib3\Net\SSH2;
 
 /**
  * @internal