diff --git a/ssh/message.py b/ssh/message.py
index 8102939..ca9226c 100644
--- a/ssh/message.py
+++ b/ssh/message.py
@@ -65,7 +65,7 @@ class Message (object):
 
         @rtype: string
         """
-        return 'paramiko.Message(' + repr(self.packet.getvalue()) + ')'
+        return 'ssh.Message(' + repr(self.packet.getvalue()) + ')'
 
     def rewind(self):
         """
diff --git a/ssh/transport.py b/ssh/transport.py
index f7d330b..3b22629 100644
--- a/ssh/transport.py
+++ b/ssh/transport.py
@@ -194,7 +194,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.7.7.1'
+    _CLIENT_ID = 'ssh_1.7.7.1'
 
     _preferred_ciphers = ( 'aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc',
         'arcfour128', 'arcfour256' )
diff --git a/tests/test_kex.py b/tests/test_kex.py
index 06f4916..b52b71b 100644
--- a/tests/test_kex.py
+++ b/tests/test_kex.py
@@ -49,7 +49,7 @@ class FakeModulusPack (object):
 
 class FakeTransport (object):
     rng = FakeRng()
-    local_version = 'SSH-2.0-paramiko_1.0'
+    local_version = 'SSH-2.0-ssh_1.0'
     remote_version = 'SSH-2.0-lame'
     local_kex_init = 'local-kex-init'
     remote_kex_init = 'remote-kex-init'
@@ -99,7 +99,7 @@ class KexTest (unittest.TestCase):
         msg.add_string('fake-sig')
         msg.rewind()
         kex.parse_next(ssh.kex_group1._MSG_KEXDH_REPLY, msg)
-        H = '03079780F3D3AD0B3C6DB30C8D21685F367A86D2'
+        H = '00EA521556297D544B4D98745424593B1E6D59E1'
         self.assertEquals(self.K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
         self.assertEquals(('fake-host-key', 'fake-sig'), transport._verify)
@@ -116,7 +116,7 @@ class KexTest (unittest.TestCase):
         msg.add_mpint(69)
         msg.rewind()
         kex.parse_next(ssh.kex_group1._MSG_KEXDH_INIT, msg)
-        H = 'B16BF34DD10945EDE84E9C1EF24A14BFDC843389'
+        H = 'D38CD8117B01531F518D7AE79BB9B0B6FA79B593'
         x = '1F0000000866616B652D6B6579000000807E2DDB1743F3487D6545F04F1C8476092FB912B013626AB5BCEB764257D88BBA64243B9F348DF7B41B8C814A995E00299913503456983FFB9178D3CD79EB6D55522418A8ABF65375872E55938AB99A84A0B5FC8A1ECC66A7C3766E7E0F80B7CE2C9225FC2DD683F4764244B72963BBB383F529DCF0C5D17740B8A2ADBE9208D40000000866616B652D736967'
         self.assertEquals(self.K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
@@ -147,7 +147,7 @@ class KexTest (unittest.TestCase):
         msg.add_string('fake-sig')
         msg.rewind()
         kex.parse_next(ssh.kex_gex._MSG_KEXDH_GEX_REPLY, msg)
-        H = 'A265563F2FA87F1A89BF007EE90D58BE2E4A4BD0'
+        H = '4D756503562803AF1F61D76C7943331B00AF5023'
         self.assertEquals(self.K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
         self.assertEquals(('fake-host-key', 'fake-sig'), transport._verify)
@@ -177,7 +177,7 @@ class KexTest (unittest.TestCase):
         msg.add_string('fake-sig')
         msg.rewind()
         kex.parse_next(ssh.kex_gex._MSG_KEXDH_GEX_REPLY, msg)
-        H = '807F87B269EF7AC5EC7E75676808776A27D5864C'
+        H = 'F1234C57E0946943B3757806BCEB8DC0C95B8D4B'
         self.assertEquals(self.K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
         self.assertEquals(('fake-host-key', 'fake-sig'), transport._verify)
@@ -205,7 +205,7 @@ class KexTest (unittest.TestCase):
         msg.rewind()
         kex.parse_next(ssh.kex_gex._MSG_KEXDH_GEX_INIT, msg)
         K = 67592995013596137876033460028393339951879041140378510871612128162185209509220726296697886624612526735888348020498716482757677848959420073720160491114319163078862905400020959196386947926388406687288901564192071077389283980347784184487280885335302632305026248574716290537036069329724382811853044654824945750581L
-        H = 'CE754197C21BF3452863B4F44D0B3951F12516EF'
+        H = 'C4EF42E2AAA44B6C3545AE0E940DEF177B59D349'
         x = '210000000866616B652D6B6579000000807E2DDB1743F3487D6545F04F1C8476092FB912B013626AB5BCEB764257D88BBA64243B9F348DF7B41B8C814A995E00299913503456983FFB9178D3CD79EB6D55522418A8ABF65375872E55938AB99A84A0B5FC8A1ECC66A7C3766E7E0F80B7CE2C9225FC2DD683F4764244B72963BBB383F529DCF0C5D17740B8A2ADBE9208D40000000866616B652D736967'
         self.assertEquals(K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())
@@ -232,7 +232,7 @@ class KexTest (unittest.TestCase):
         msg.rewind()
         kex.parse_next(ssh.kex_gex._MSG_KEXDH_GEX_INIT, msg)
         K = 67592995013596137876033460028393339951879041140378510871612128162185209509220726296697886624612526735888348020498716482757677848959420073720160491114319163078862905400020959196386947926388406687288901564192071077389283980347784184487280885335302632305026248574716290537036069329724382811853044654824945750581L
-        H = 'B41A06B2E59043CEFC1AE16EC31F1E2D12EC455B'
+        H = '75A12FD284C6536BA768307579DBE6F9B5087BC6'
         x = '210000000866616B652D6B6579000000807E2DDB1743F3487D6545F04F1C8476092FB912B013626AB5BCEB764257D88BBA64243B9F348DF7B41B8C814A995E00299913503456983FFB9178D3CD79EB6D55522418A8ABF65375872E55938AB99A84A0B5FC8A1ECC66A7C3766E7E0F80B7CE2C9225FC2DD683F4764244B72963BBB383F529DCF0C5D17740B8A2ADBE9208D40000000866616B652D736967'
         self.assertEquals(K, transport._K)
         self.assertEquals(H, hexlify(transport._H).upper())