Merge pull request #950 from Kriechi/rename

Rename lib folders

50 files changed, 267 insertions, 156 deletions

diff --git a/test/mitmproxy/scripts/concurrent_decorator.py b/test/mitmproxy/scripts/concurrent_decorator.py
index f6feda1d..6651c811 100644
--- a/test/mitmproxy/scripts/concurrent_decorator.py
+++ b/test/mitmproxy/scripts/concurrent_decorator.py
@@ -1,5 +1,5 @@
 import time
-from libmproxy.script import concurrent
+from mitmproxy.script import concurrent
 
 
 @concurrent
diff --git a/test/mitmproxy/scripts/concurrent_decorator_err.py b/test/mitmproxy/scripts/concurrent_decorator_err.py
index 00fd8dad..071b8889 100644
--- a/test/mitmproxy/scripts/concurrent_decorator_err.py
+++ b/test/mitmproxy/scripts/concurrent_decorator_err.py
@@ -1,4 +1,4 @@
-from libmproxy.script import concurrent
+from mitmproxy.script import concurrent
 
 
 @concurrent
diff --git a/test/mitmproxy/test_app.py b/test/mitmproxy/test_app.py
index 577a70a5..8d8ce271 100644
--- a/test/mitmproxy/test_app.py
+++ b/test/mitmproxy/test_app.py
@@ -1,7 +1,7 @@
 from . import tutils, tservers
 
 
-class TestApp(tservers.HTTPProxTest):
+class TestApp(tservers.HTTPProxyTest):
 
     def test_basic(self):
         assert self.app("/").status_code == 200
diff --git a/test/mitmproxy/test_cmdline.py b/test/mitmproxy/test_cmdline.py
index 9b3317aa..5a70f3e0 100644
--- a/test/mitmproxy/test_cmdline.py
+++ b/test/mitmproxy/test_cmdline.py
@@ -1,5 +1,5 @@
 import argparse
-from libmproxy import cmdline
+from mitmproxy import cmdline
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_console.py b/test/mitmproxy/test_console.py
index e64ed44a..58a812a6 100644
--- a/test/mitmproxy/test_console.py
+++ b/test/mitmproxy/test_console.py
@@ -1,8 +1,8 @@
 import gc
 
 import netlib.tutils
-from libmproxy import console
-from libmproxy.console import common
+from mitmproxy import console
+from mitmproxy.console import common
 
 from . import tutils
 
diff --git a/test/mitmproxy/test_console_common.py b/test/mitmproxy/test_console_common.py
index deba5f6c..219200e0 100644
--- a/test/mitmproxy/test_console_common.py
+++ b/test/mitmproxy/test_console_common.py
@@ -4,7 +4,7 @@ if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
 
-import libmproxy.console.common as common
+import mitmproxy.console.common as common
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_console_help.py b/test/mitmproxy/test_console_help.py
index f1a71faf..0589bd68 100644
--- a/test/mitmproxy/test_console_help.py
+++ b/test/mitmproxy/test_console_help.py
@@ -3,7 +3,7 @@ from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
-import libmproxy.console.help as help
+import mitmproxy.console.help as help
 
 
 class TestHelp:
diff --git a/test/mitmproxy/test_console_palettes.py b/test/mitmproxy/test_console_palettes.py
index ac33f83d..b5d84ddd 100644
--- a/test/mitmproxy/test_console_palettes.py
+++ b/test/mitmproxy/test_console_palettes.py
@@ -2,7 +2,7 @@ import os
 from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
-import libmproxy.console.palettes as palettes
+import mitmproxy.console.palettes as palettes
 
 
 class TestPalette:
diff --git a/test/mitmproxy/test_console_pathedit.py b/test/mitmproxy/test_console_pathedit.py
index 940351f5..e2c27b7c 100644
--- a/test/mitmproxy/test_console_pathedit.py
+++ b/test/mitmproxy/test_console_pathedit.py
@@ -1,6 +1,6 @@
 import os
 from os.path import normpath
-from libmproxy.console import pathedit
+from mitmproxy.console import pathedit
 
 from . import tutils
 
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index af80d63a..7f1d735e 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -1,9 +1,9 @@
-from libmproxy.exceptions import ContentViewException
+from mitmproxy.exceptions import ContentViewException
 from netlib.http import Headers
 import netlib.utils
 from netlib import encoding
 
-import libmproxy.contentviews as cv
+import mitmproxy.contentviews as cv
 from . import tutils
 
 try:
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py
index ffc7d433..eb3f7df4 100644
--- a/test/mitmproxy/test_controller.py
+++ b/test/mitmproxy/test_controller.py
@@ -1,5 +1,5 @@
 import mock
-from libmproxy import controller
+from mitmproxy import controller
 
 
 class TestMaster:
diff --git a/test/mitmproxy/test_custom_contentview.py b/test/mitmproxy/test_custom_contentview.py
index adc4109b..479b0b43 100644
--- a/test/mitmproxy/test_custom_contentview.py
+++ b/test/mitmproxy/test_custom_contentview.py
@@ -1,4 +1,4 @@
-import libmproxy.contentviews as cv
+import mitmproxy.contentviews as cv
 from netlib.http import Headers
 
 
diff --git a/test/mitmproxy/test_dump.py b/test/mitmproxy/test_dump.py
index dbd0c653..3588a73f 100644
--- a/test/mitmproxy/test_dump.py
+++ b/test/mitmproxy/test_dump.py
@@ -1,13 +1,13 @@
 import os
 from cStringIO import StringIO
-from libmproxy.exceptions import ContentViewException
-from libmproxy.models import HTTPResponse
+from mitmproxy.exceptions import ContentViewException
+from mitmproxy.models import HTTPResponse
 
 import netlib.tutils
 from netlib.http import CONTENT_MISSING
 
-from libmproxy import dump, flow
-from libmproxy.proxy import Log
+from mitmproxy import dump, flow
+from mitmproxy.proxy import Log
 from . import tutils
 import mock
 
@@ -49,7 +49,7 @@ def test_strfuncs():
     m.echo_flow(flow)
 
 
-@mock.patch("libmproxy.contentviews.get_content_view")
+@mock.patch("mitmproxy.contentviews.get_content_view")
 def test_contentview(get_content_view):
     get_content_view.side_effect = ContentViewException(""), ("x", iter([]))
 
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index bb7c596b..6920c8e9 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -1,11 +1,11 @@
 import glob
-from libmproxy import utils, script
-from libmproxy.proxy import config
+from mitmproxy import utils, script
+from mitmproxy.proxy import config
 from . import tservers
 
 
 def test_load_scripts():
-    example_dir = utils.Data("libmproxy").path("../examples")
+    example_dir = utils.Data("mitmproxy").path("../examples")
     scripts = glob.glob("%s/*.py" % example_dir)
 
     tmaster = tservers.TestMaster(config.ProxyConfig())
diff --git a/test/mitmproxy/test_filt.py b/test/mitmproxy/test_filt.py
index e6873c7d..0ea635e7 100644
--- a/test/mitmproxy/test_filt.py
+++ b/test/mitmproxy/test_filt.py
@@ -1,7 +1,7 @@
 import cStringIO
-from libmproxy import filt
-from libmproxy.models import Error
-from libmproxy.models import http
+from mitmproxy import filt
+from mitmproxy.models import Error
+from mitmproxy.models import http
 from netlib.http import Headers
 from . import tutils
 
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index b122489f..a593c8c3 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -9,16 +9,16 @@ import mock
 import netlib.utils
 from netlib import odict
 from netlib.http import CONTENT_MISSING, Headers
-from libmproxy import filt, controller, tnetstring, flow
-from libmproxy.models import Error
-from libmproxy.models import Flow
-from libmproxy.models import HTTPFlow
-from libmproxy.models import HTTPRequest
-from libmproxy.models import HTTPResponse
-from libmproxy.proxy.config import HostMatcher
-from libmproxy.proxy import ProxyConfig
-from libmproxy.proxy.server import DummyServer
-from libmproxy.models.connections import ClientConnection
+from mitmproxy import filt, controller, tnetstring, flow
+from mitmproxy.models import Error
+from mitmproxy.models import Flow
+from mitmproxy.models import HTTPFlow
+from mitmproxy.models import HTTPRequest
+from mitmproxy.models import HTTPResponse
+from mitmproxy.proxy.config import HostMatcher
+from mitmproxy.proxy import ProxyConfig
+from mitmproxy.proxy.server import DummyServer
+from mitmproxy.models.connections import ClientConnection
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index e5e9c0a3..2dce3fd6 100644
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@@ -1,7 +1,7 @@
 from textwrap import dedent
 
 import netlib.tutils
-from libmproxy import flow_export
+from mitmproxy import flow_export
 from . import tutils
 
 req_get = netlib.tutils.treq(
diff --git a/test/mitmproxy/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py
index 232f5473..7a0694e1 100644
--- a/test/mitmproxy/test_flow_format_compat.py
+++ b/test/mitmproxy/test_flow_format_compat.py
@@ -1,4 +1,4 @@
-from libmproxy.flow import FlowReader, FlowReadError
+from mitmproxy.flow import FlowReader, FlowReadError
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_fuzzing.py b/test/mitmproxy/test_fuzzing.py
index cec64f58..27ea36a6 100644
--- a/test/mitmproxy/test_fuzzing.py
+++ b/test/mitmproxy/test_fuzzing.py
@@ -6,7 +6,7 @@ from . import tservers
 """
 
 
-class TestFuzzy(tservers.HTTPProxTest):
+class TestFuzzy(tservers.HTTPProxyTest):
 
     def test_idna_err(self):
         req = r'get:"http://localhost:%s":i10,"\xc6"'
diff --git a/test/mitmproxy/test_platform_pf.py b/test/mitmproxy/test_platform_pf.py
index 8994ee0d..5082fafb 100644
--- a/test/mitmproxy/test_platform_pf.py
+++ b/test/mitmproxy/test_platform_pf.py
@@ -1,5 +1,5 @@
 import sys
-from libmproxy.platform import pf
+from mitmproxy.platform import pf
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_protocol_http1.py b/test/mitmproxy/test_protocol_http1.py
index 13e0eabe..e0a57b4e 100644
--- a/test/mitmproxy/test_protocol_http1.py
+++ b/test/mitmproxy/test_protocol_http1.py
@@ -11,7 +11,7 @@ class TestHTTPFlow(object):
         assert repr(f)
 
 
-class TestInvalidRequests(tservers.HTTPProxTest):
+class TestInvalidRequests(tservers.HTTPProxyTest):
     ssl = True
 
     def test_double_connect(self):
@@ -28,7 +28,7 @@ class TestInvalidRequests(tservers.HTTPProxTest):
         assert "Invalid HTTP request form" in r.content
 
 
-class TestExpectHeader(tservers.HTTPProxTest):
+class TestExpectHeader(tservers.HTTPProxyTest):
 
     def test_simple(self):
         client = TCPClient(("127.0.0.1", self.proxy.port))
@@ -55,7 +55,7 @@ class TestExpectHeader(tservers.HTTPProxTest):
         client.finish()
 
 
-class TestHeadContentLength(tservers.HTTPProxTest):
+class TestHeadContentLength(tservers.HTTPProxyTest):
 
     def test_head_content_length(self):
         p = self.pathoc()
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index 6d3bb43f..1da140d8 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
@@ -6,8 +6,8 @@ import traceback
 import os
 import tempfile
 
-from libmproxy.proxy.config import ProxyConfig
-from libmproxy.cmdline import APP_HOST, APP_PORT
+from mitmproxy.proxy.config import ProxyConfig
+from mitmproxy.cmdline import APP_HOST, APP_PORT
 
 import logging
 logging.getLogger("hyper.packages.hpack.hpack").setLevel(logging.WARNING)
@@ -18,7 +18,7 @@ logging.getLogger("PIL.Image").setLevel(logging.WARNING)
 logging.getLogger("PIL.PngImagePlugin").setLevel(logging.WARNING)
 
 import netlib
-from netlib import tservers as netlib_tservers
+from ..netlib import tservers as netlib_tservers
 from netlib.utils import http2_read_raw_frame
 
 import h2
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
index 27ae70a8..34b75b62 100644
--- a/test/mitmproxy/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
@@ -2,13 +2,13 @@ import os
 import mock
 from OpenSSL import SSL
 
-from libmproxy import cmdline
-from libmproxy.proxy import ProxyConfig
-from libmproxy.proxy.config import process_proxy_options
-from libmproxy.models.connections import ServerConnection
-from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
+from mitmproxy import cmdline
+from mitmproxy.proxy import ProxyConfig
+from mitmproxy.proxy.config import process_proxy_options
+from mitmproxy.models.connections import ServerConnection
+from mitmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
 from netlib.exceptions import TcpDisconnect
-from libpathod import test
+from pathod import test
 from netlib.http import http1
 from . import tutils
 
@@ -76,11 +76,11 @@ class TestProcessProxyOptions:
         with tutils.tmpdir() as cadir:
             self.assert_noerr("--cadir", cadir)
 
-    @mock.patch("libmproxy.platform.resolver", None)
+    @mock.patch("mitmproxy.platform.resolver", None)
     def test_no_transparent(self):
         self.assert_err("transparent mode not supported", "-T")
 
-    @mock.patch("libmproxy.platform.resolver")
+    @mock.patch("mitmproxy.platform.resolver")
     def test_modes(self, _):
         self.assert_noerr("-R", "http://localhost")
         self.assert_err("expected one argument", "-R")
diff --git a/test/mitmproxy/test_script.py b/test/mitmproxy/test_script.py
index f3a6499e..b827c623 100644
--- a/test/mitmproxy/test_script.py
+++ b/test/mitmproxy/test_script.py
@@ -1,7 +1,7 @@
 import os
 import time
 import mock
-from libmproxy import script, flow
+from mitmproxy import script, flow
 from . import tutils
 
 
@@ -68,7 +68,7 @@ def test_concurrent():
     fm = flow.FlowMaster(None, s)
     fm.load_script(tutils.test_data.path("scripts/concurrent_decorator.py"))
 
-    with mock.patch("libmproxy.controller.DummyReply.__call__") as m:
+    with mock.patch("mitmproxy.controller.DummyReply.__call__") as m:
         f1, f2 = tutils.tflow(), tutils.tflow()
         t_start = time.time()
         fm.handle_request(f1)
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index 1b7e6966..d7b23bbb 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -10,11 +10,11 @@ from netlib import tcp, http, socks
 from netlib.certutils import SSLCert
 from netlib.http import authentication, CONTENT_MISSING, http1
 from netlib.tutils import raises
-from libpathod import pathoc, pathod
+from pathod import pathoc, pathod
 
-from libmproxy.proxy.config import HostMatcher
-from libmproxy.protocol import Kill
-from libmproxy.models import Error, HTTPResponse
+from mitmproxy.proxy.config import HostMatcher
+from mitmproxy.protocol import Kill
+from mitmproxy.models import Error, HTTPResponse
 
 from . import tutils, tservers
 
@@ -45,7 +45,7 @@ class CommonMixin:
 
     def test_replay(self):
         assert self.pathod("304").status_code == 304
-        if isinstance(self, tservers.HTTPUpstreamProxTest) and self.ssl:
+        if isinstance(self, tservers.HTTPUpstreamProxyTest) and self.ssl:
             assert len(self.master.state.view) == 2
         else:
             assert len(self.master.state.view) == 1
@@ -60,7 +60,7 @@ class CommonMixin:
         l.request.path = "/p/305:d0"
         rt = self.master.replay_request(l, block=True)
         assert not rt
-        if isinstance(self, tservers.HTTPUpstreamProxTest):
+        if isinstance(self, tservers.HTTPUpstreamProxyTest):
             assert l.response.status_code == 502
         else:
             assert l.error
@@ -72,7 +72,7 @@ class CommonMixin:
         # SSL with the upstream proxy.
         rt = self.master.replay_request(l, block=True)
         assert not rt
-        if isinstance(self, tservers.HTTPUpstreamProxTest):
+        if isinstance(self, tservers.HTTPUpstreamProxyTest):
             assert l.response.status_code == 502
         else:
             assert l.error
@@ -202,7 +202,7 @@ class AppMixin:
         assert "mitmproxy" in ret.content
 
 
-class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin):
+class TestHTTP(tservers.HTTPProxyTest, CommonMixin, AppMixin):
 
     def test_app_err(self):
         p = self.pathoc()
@@ -292,7 +292,7 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin):
         self.master.unload_scripts()
 
 
-class TestHTTPAuth(tservers.HTTPProxTest):
+class TestHTTPAuth(tservers.HTTPProxyTest):
     authenticator = http.authentication.BasicProxyAuth(
         http.authentication.PassManSingleUser(
             "test",
@@ -314,7 +314,7 @@ class TestHTTPAuth(tservers.HTTPProxTest):
         assert ret.status_code == 202
 
 
-class TestHTTPS(tservers.HTTPProxTest, CommonMixin, TcpMixin):
+class TestHTTPS(tservers.HTTPProxyTest, CommonMixin, TcpMixin):
     ssl = True
     ssloptions = pathod.SSLOptions(request_client_cert=True)
 
@@ -342,7 +342,7 @@ class TestHTTPS(tservers.HTTPProxTest, CommonMixin, TcpMixin):
         assert p.request("get:/:i0,'invalid\r\n\r\n'").status_code == 400
 
 
-class TestHTTPSCertfile(tservers.HTTPProxTest, CommonMixin):
+class TestHTTPSCertfile(tservers.HTTPProxyTest, CommonMixin):
     ssl = True
     certfile = True
 
@@ -350,7 +350,7 @@ class TestHTTPSCertfile(tservers.HTTPProxTest, CommonMixin):
         assert self.pathod("304")
 
 
-class TestHTTPSUpstreamServerVerificationWTrustedCert(tservers.HTTPProxTest):
+class TestHTTPSUpstreamServerVerificationWTrustedCert(tservers.HTTPProxyTest):
 
     """
     Test upstream server certificate verification with a trusted server cert.
@@ -377,7 +377,7 @@ class TestHTTPSUpstreamServerVerificationWTrustedCert(tservers.HTTPProxTest):
         self.pathoc()
 
 
-class TestHTTPSUpstreamServerVerificationWBadCert(tservers.HTTPProxTest):
+class TestHTTPSUpstreamServerVerificationWBadCert(tservers.HTTPProxyTest):
 
     """
     Test upstream server certificate verification with an untrusted server cert.
@@ -416,7 +416,7 @@ class TestHTTPSUpstreamServerVerificationWBadCert(tservers.HTTPProxTest):
         assert self._request().status_code == 502
 
 
-class TestHTTPSNoCommonName(tservers.HTTPProxTest):
+class TestHTTPSNoCommonName(tservers.HTTPProxyTest):
 
     """
     Test what happens if we get a cert without common name back.
@@ -433,7 +433,7 @@ class TestHTTPSNoCommonName(tservers.HTTPProxTest):
         assert f.sslinfo.certchain[0].get_subject().CN == "127.0.0.1"
 
 
-class TestReverse(tservers.ReverseProxTest, CommonMixin, TcpMixin):
+class TestReverse(tservers.ReverseProxyTest, CommonMixin, TcpMixin):
     reverse = True
 
 
@@ -475,7 +475,7 @@ class TestSocks5(tservers.SocksModeTest):
         assert "SOCKS5 mode failure" in f.content
 
 
-class TestHttps2Http(tservers.ReverseProxTest):
+class TestHttps2Http(tservers.ReverseProxyTest):
 
     @classmethod
     def get_proxy_config(cls):
@@ -507,7 +507,7 @@ class TestHttps2Http(tservers.ReverseProxTest):
         assert p.request("get:'/p/200'").status_code == 200
 
 
-class TestTransparent(tservers.TransparentProxTest, CommonMixin, TcpMixin):
+class TestTransparent(tservers.TransparentProxyTest, CommonMixin, TcpMixin):
     ssl = False
 
     def test_tcp_stream_modify(self):
@@ -523,7 +523,7 @@ class TestTransparent(tservers.TransparentProxTest, CommonMixin, TcpMixin):
         self.master.unload_scripts()
 
 
-class TestTransparentSSL(tservers.TransparentProxTest, CommonMixin, TcpMixin):
+class TestTransparentSSL(tservers.TransparentProxyTest, CommonMixin, TcpMixin):
     ssl = True
 
     def test_sslerr(self):
@@ -533,7 +533,7 @@ class TestTransparentSSL(tservers.TransparentProxTest, CommonMixin, TcpMixin):
         assert r.status_code == 502
 
 
-class TestProxy(tservers.HTTPProxTest):
+class TestProxy(tservers.HTTPProxyTest):
 
     def test_http(self):
         f = self.pathod("304")
@@ -611,7 +611,7 @@ class TestProxy(tservers.HTTPProxTest):
         assert f.server_conn.address == ("127.0.0.1", self.server.port)
 
 
-class TestProxySSL(tservers.HTTPProxTest):
+class TestProxySSL(tservers.HTTPProxyTest):
     ssl = True
 
     def test_request_ssl_setup_timestamp_presence(self):
@@ -644,7 +644,7 @@ class MasterRedirectRequest(tservers.TestMaster):
         super(MasterRedirectRequest, self).handle_response(f)
 
 
-class TestRedirectRequest(tservers.HTTPProxTest):
+class TestRedirectRequest(tservers.HTTPProxyTest):
     masterclass = MasterRedirectRequest
     ssl = True
 
@@ -697,7 +697,7 @@ class MasterStreamRequest(tservers.TestMaster):
         f.reply()
 
 
-class TestStreamRequest(tservers.HTTPProxTest):
+class TestStreamRequest(tservers.HTTPProxyTest):
     masterclass = MasterStreamRequest
 
     def test_stream_simple(self):
@@ -747,7 +747,7 @@ class MasterFakeResponse(tservers.TestMaster):
         f.reply(resp)
 
 
-class TestFakeResponse(tservers.HTTPProxTest):
+class TestFakeResponse(tservers.HTTPProxyTest):
     masterclass = MasterFakeResponse
 
     def test_fake(self):
@@ -755,7 +755,7 @@ class TestFakeResponse(tservers.HTTPProxTest):
         assert "header-response" in f.headers
 
 
-class TestServerConnect(tservers.HTTPProxTest):
+class TestServerConnect(tservers.HTTPProxyTest):
     masterclass = MasterFakeResponse
     no_upstream_cert = True
     ssl = True
@@ -773,7 +773,7 @@ class MasterKillRequest(tservers.TestMaster):
         f.reply(Kill)
 
 
-class TestKillRequest(tservers.HTTPProxTest):
+class TestKillRequest(tservers.HTTPProxyTest):
     masterclass = MasterKillRequest
 
     def test_kill(self):
@@ -789,7 +789,7 @@ class MasterKillResponse(tservers.TestMaster):
         f.reply(Kill)
 
 
-class TestKillResponse(tservers.HTTPProxTest):
+class TestKillResponse(tservers.HTTPProxyTest):
     masterclass = MasterKillResponse
 
     def test_kill(self):
@@ -805,7 +805,7 @@ class EResolver(tservers.TResolver):
         raise RuntimeError("Could not resolve original destination.")
 
 
-class TestTransparentResolveError(tservers.TransparentProxTest):
+class TestTransparentResolveError(tservers.TransparentProxyTest):
     resolver = EResolver
 
     def test_resolve_error(self):
@@ -820,14 +820,14 @@ class MasterIncomplete(tservers.TestMaster):
         f.reply(resp)
 
 
-class TestIncompleteResponse(tservers.HTTPProxTest):
+class TestIncompleteResponse(tservers.HTTPProxyTest):
     masterclass = MasterIncomplete
 
     def test_incomplete(self):
         assert self.pathod("200").status_code == 502
 
 
-class TestUpstreamProxy(tservers.HTTPUpstreamProxTest, CommonMixin, AppMixin):
+class TestUpstreamProxy(tservers.HTTPUpstreamProxyTest, CommonMixin, AppMixin):
     ssl = False
 
     def test_order(self):
@@ -849,7 +849,7 @@ class TestUpstreamProxy(tservers.HTTPUpstreamProxTest, CommonMixin, AppMixin):
 
 
 class TestUpstreamProxySSL(
-        tservers.HTTPUpstreamProxTest,
+        tservers.HTTPUpstreamProxyTest,
         CommonMixin,
         TcpMixin):
     ssl = True
@@ -918,7 +918,7 @@ class TestUpstreamProxySSL(
         assert self.chain[1].tmaster.state.flow_count() == 1
 
 
-class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxTest):
+class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest):
     ssl = True
 
     def test_reconnect(self):
diff --git a/test/mitmproxy/test_utils.py b/test/mitmproxy/test_utils.py
index 17bf3dbf..ae6369ae 100644
--- a/test/mitmproxy/test_utils.py
+++ b/test/mitmproxy/test_utils.py
@@ -1,5 +1,5 @@
 import json
-from libmproxy import utils
+from mitmproxy import utils
 from . import tutils
 
 utils.CERT_SLEEP_TIME = 0
diff --git a/test/mitmproxy/tools/benchtool.py b/test/mitmproxy/tools/benchtool.py
index a1d80697..17043676 100644
--- a/test/mitmproxy/tools/benchtool.py
+++ b/test/mitmproxy/tools/benchtool.py
@@ -5,7 +5,7 @@
 # - Apache Bench "ab" binary
 # - pip install click yappi
 
-from libmproxy.main import mitmdump
+from mitmproxy.main import mitmdump
 from os import system
 from threading import Thread
 import time
diff --git a/test/mitmproxy/tools/inspect_dumpfile.py b/test/mitmproxy/tools/inspect_dumpfile.py
index d15e9e8a..b2201f40 100644
--- a/test/mitmproxy/tools/inspect_dumpfile.py
+++ b/test/mitmproxy/tools/inspect_dumpfile.py
@@ -2,7 +2,7 @@ from pprint import pprint
 
 import click
 
-from libmproxy import tnetstring
+from mitmproxy import tnetstring
 
 
 def read_tnetstring(input):
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index dbc9f7d0..b7b5de9e 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -4,12 +4,12 @@ import tempfile
 import flask
 import mock
 
-from libmproxy.proxy.config import ProxyConfig
-from libmproxy.proxy.server import ProxyServer
-import libpathod.test
-import libpathod.pathoc
-from libmproxy import flow, controller
-from libmproxy.cmdline import APP_HOST, APP_PORT
+from mitmproxy.proxy.config import ProxyConfig
+from mitmproxy.proxy.server import ProxyServer
+import pathod.test
+import pathod.pathoc
+from mitmproxy import flow, controller
+from mitmproxy.cmdline import APP_HOST, APP_PORT
 
 testapp = flask.Flask(__name__)
 
@@ -79,7 +79,7 @@ class ProxyThread(threading.Thread):
         self.tmaster.shutdown()
 
 
-class ProxTestBase(object):
+class ProxyTestBase(object):
     # Test Configuration
     ssl = None
     ssloptions = False
@@ -89,10 +89,10 @@ class ProxTestBase(object):
 
     @classmethod
     def setup_class(cls):
-        cls.server = libpathod.test.Daemon(
+        cls.server = pathod.test.Daemon(
             ssl=cls.ssl,
             ssloptions=cls.ssloptions)
-        cls.server2 = libpathod.test.Daemon(
+        cls.server2 = pathod.test.Daemon(
             ssl=cls.ssl,
             ssloptions=cls.ssloptions)
 
@@ -132,16 +132,16 @@ class ProxTestBase(object):
         )
 
 
-class HTTPProxTest(ProxTestBase):
+class HTTPProxyTest(ProxyTestBase):
 
     def pathoc_raw(self):
-        return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None)
+        return pathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None)
 
     def pathoc(self, sni=None):
         """
             Returns a connected Pathoc instance.
         """
-        p = libpathod.pathoc.Pathoc(
+        p = pathod.pathoc.Pathoc(
             ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
         )
         if self.ssl:
@@ -164,7 +164,7 @@ class HTTPProxTest(ProxTestBase):
 
     def app(self, page):
         if self.ssl:
-            p = libpathod.pathoc.Pathoc(
+            p = pathod.pathoc.Pathoc(
                 ("127.0.0.1", self.proxy.port), True, fp=None
             )
             p.connect((APP_HOST, APP_PORT))
@@ -183,16 +183,16 @@ class TResolver:
         return ("127.0.0.1", self.port)
 
 
-class TransparentProxTest(ProxTestBase):
+class TransparentProxyTest(ProxyTestBase):
     ssl = None
     resolver = TResolver
 
     @classmethod
     def setup_class(cls):
-        super(TransparentProxTest, cls).setup_class()
+        super(TransparentProxyTest, cls).setup_class()
 
         cls._resolver = mock.patch(
-            "libmproxy.platform.resolver",
+            "mitmproxy.platform.resolver",
             new=lambda: cls.resolver(cls.server.port)
         )
         cls._resolver.start()
@@ -200,11 +200,11 @@ class TransparentProxTest(ProxTestBase):
     @classmethod
     def teardown_class(cls):
         cls._resolver.stop()
-        super(TransparentProxTest, cls).teardown_class()
+        super(TransparentProxyTest, cls).teardown_class()
 
     @classmethod
     def get_proxy_config(cls):
-        d = ProxTestBase.get_proxy_config()
+        d = ProxyTestBase.get_proxy_config()
         d["mode"] = "transparent"
         return d
 
@@ -224,19 +224,19 @@ class TransparentProxTest(ProxTestBase):
         """
             Returns a connected Pathoc instance.
         """
-        p = libpathod.pathoc.Pathoc(
+        p = pathod.pathoc.Pathoc(
             ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
         )
         p.connect()
         return p
 
 
-class ReverseProxTest(ProxTestBase):
+class ReverseProxyTest(ProxyTestBase):
     ssl = None
 
     @classmethod
     def get_proxy_config(cls):
-        d = ProxTestBase.get_proxy_config()
+        d = ProxyTestBase.get_proxy_config()
         d["upstream_server"] = (
             "https" if cls.ssl else "http",
             ("127.0.0.1", cls.server.port)
@@ -248,7 +248,7 @@ class ReverseProxTest(ProxTestBase):
         """
             Returns a connected Pathoc instance.
         """
-        p = libpathod.pathoc.Pathoc(
+        p = pathod.pathoc.Pathoc(
             ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
         )
         p.connect()
@@ -267,16 +267,16 @@ class ReverseProxTest(ProxTestBase):
         return p.request(q)
 
 
-class SocksModeTest(HTTPProxTest):
+class SocksModeTest(HTTPProxyTest):
 
     @classmethod
     def get_proxy_config(cls):
-        d = ProxTestBase.get_proxy_config()
+        d = ProxyTestBase.get_proxy_config()
         d["mode"] = "socks5"
         return d
 
 
-class ChainProxTest(ProxTestBase):
+class ChainProxyTest(ProxyTestBase):
 
     """
     Chain three instances of mitmproxy in a row to test upstream mode.
@@ -290,7 +290,7 @@ class ChainProxTest(ProxTestBase):
     @classmethod
     def setup_class(cls):
         cls.chain = []
-        super(ChainProxTest, cls).setup_class()
+        super(ChainProxyTest, cls).setup_class()
         for _ in range(cls.n):
             config = ProxyConfig(**cls.get_proxy_config())
             tmaster = cls.masterclass(config)
@@ -304,19 +304,19 @@ class ChainProxTest(ProxTestBase):
 
     @classmethod
     def teardown_class(cls):
-        super(ChainProxTest, cls).teardown_class()
+        super(ChainProxyTest, cls).teardown_class()
         for proxy in cls.chain:
             proxy.shutdown()
 
     def setup(self):
-        super(ChainProxTest, self).setup()
+        super(ChainProxyTest, self).setup()
         for proxy in self.chain:
             proxy.tmaster.clear_log()
             proxy.tmaster.state.clear()
 
     @classmethod
     def get_proxy_config(cls):
-        d = super(ChainProxTest, cls).get_proxy_config()
+        d = super(ChainProxyTest, cls).get_proxy_config()
         if cls.chain:  # First proxy is in normal mode.
             d.update(
                 mode="upstream",
@@ -325,5 +325,5 @@ class ChainProxTest(ProxTestBase):
         return d
 
 
-class HTTPUpstreamProxTest(ChainProxTest, HTTPProxTest):
+class HTTPUpstreamProxyTest(ChainProxyTest, HTTPProxyTest):
     pass
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index 2ce0884d..edcdf3e2 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -9,8 +9,8 @@ from contextlib import contextmanager
 from unittest.case import SkipTest
 
 import netlib.tutils
-from libmproxy import utils, controller
-from libmproxy.models import (
+from mitmproxy import utils, controller
+from mitmproxy.models import (
     ClientConnection, ServerConnection, Error, HTTPRequest, HTTPResponse, HTTPFlow
 )
 
@@ -39,12 +39,12 @@ def skip_appveyor(fn):
 
 def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
     """
-    @type client_conn: bool | None | libmproxy.proxy.connection.ClientConnection
-    @type server_conn: bool | None | libmproxy.proxy.connection.ServerConnection
-    @type req:         bool | None | libmproxy.protocol.http.HTTPRequest
-    @type resp:        bool | None | libmproxy.protocol.http.HTTPResponse
-    @type err:         bool | None | libmproxy.protocol.primitives.Error
-    @return:           bool | None | libmproxy.protocol.http.HTTPFlow
+    @type client_conn: bool | None | mitmproxy.proxy.connection.ClientConnection
+    @type server_conn: bool | None | mitmproxy.proxy.connection.ServerConnection
+    @type req:         bool | None | mitmproxy.protocol.http.HTTPRequest
+    @type resp:        bool | None | mitmproxy.protocol.http.HTTPResponse
+    @type err:         bool | None | mitmproxy.protocol.primitives.Error
+    @return:           bool | None | mitmproxy.protocol.http.HTTPFlow
     """
     if client_conn is True:
         client_conn = tclient_conn()
@@ -72,7 +72,7 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
 
 def tclient_conn():
     """
-    @return: libmproxy.proxy.connection.ClientConnection
+    @return: mitmproxy.proxy.connection.ClientConnection
     """
     c = ClientConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
@@ -88,7 +88,7 @@ def tclient_conn():
 
 def tserver_conn():
     """
-    @return: libmproxy.proxy.connection.ServerConnection
+    @return: mitmproxy.proxy.connection.ServerConnection
     """
     c = ServerConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
@@ -108,7 +108,7 @@ def tserver_conn():
 
 def terr(content="error"):
     """
-    @return: libmproxy.protocol.primitives.Error
+    @return: mitmproxy.protocol.primitives.Error
     """
     err = Error(content)
     return err
diff --git a/test/netlib/http/http2/test_connections.py b/test/netlib/http/http2/test_connections.py
index 8be127e4..c067d487 100644
--- a/test/netlib/http/http2/test_connections.py
+++ b/test/netlib/http/http2/test_connections.py
@@ -4,11 +4,12 @@ import codecs
 
 from hyperframe.frame import *
 
-from netlib import tcp, http, utils, tservers
+from netlib import tcp, http, utils
 from netlib.tutils import raises
 from netlib.exceptions import TcpDisconnect
 from netlib.http.http2.connections import HTTP2Protocol, TCPHandler
 
+from ... import tservers
 
 class TestTCPHandlerWrapper:
     def test_wrapped(self):
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py
index 8ae3aa51..e65a2e2f 100644
--- a/test/netlib/test_tcp.py
+++ b/test/netlib/test_tcp.py
@@ -10,10 +10,11 @@ import mock
 from OpenSSL import SSL
 import OpenSSL
 
-from netlib import tcp, certutils, tutils, tservers
+from netlib import tcp, certutils, tutils
 from netlib.exceptions import InvalidCertificateException, TcpReadIncomplete, TlsException, \
     TcpTimeout, TcpDisconnect, TcpException, NetlibException
 
+from . import tservers
 
 class EchoHandler(tcp.BaseHandler):
     sni = None
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py
new file mode 100644
index 00000000..569745e6
--- /dev/null
+++ b/test/netlib/tservers.py
@@ -0,0 +1,109 @@
+from __future__ import (absolute_import, print_function, division)
+
+import threading
+from six.moves import queue
+from io import StringIO
+import OpenSSL
+
+from netlib import tcp
+from netlib import tutils
+
+
+class _ServerThread(threading.Thread):
+
+    def __init__(self, server):
+        self.server = server
+        threading.Thread.__init__(self)
+
+    def run(self):
+        self.server.serve_forever()
+
+    def shutdown(self):
+        self.server.shutdown()
+
+
+class _TServer(tcp.TCPServer):
+
+    def __init__(self, ssl, q, handler_klass, addr):
+        """
+            ssl: A dictionary of SSL parameters:
+
+                    cert, key, request_client_cert, cipher_list,
+                    dhparams, v3_only
+        """
+        tcp.TCPServer.__init__(self, addr)
+
+        if ssl is True:
+            self.ssl = dict()
+        elif isinstance(ssl, dict):
+            self.ssl = ssl
+        else:
+            self.ssl = None
+
+        self.q = q
+        self.handler_klass = handler_klass
+        self.last_handler = None
+
+    def handle_client_connection(self, request, client_address):
+        h = self.handler_klass(request, client_address, self)
+        self.last_handler = h
+        if self.ssl is not None:
+            cert = self.ssl.get(
+                "cert",
+                tutils.test_data.path("data/server.crt"))
+            raw_key = self.ssl.get(
+                "key",
+                tutils.test_data.path("data/server.key"))
+            key = OpenSSL.crypto.load_privatekey(
+                OpenSSL.crypto.FILETYPE_PEM,
+                open(raw_key, "rb").read())
+            if self.ssl.get("v3_only", False):
+                method = OpenSSL.SSL.SSLv3_METHOD
+                options = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_TLSv1
+            else:
+                method = OpenSSL.SSL.SSLv23_METHOD
+                options = None
+            h.convert_to_ssl(
+                cert, key,
+                method=method,
+                options=options,
+                handle_sni=getattr(h, "handle_sni", None),
+                request_client_cert=self.ssl.get("request_client_cert", None),
+                cipher_list=self.ssl.get("cipher_list", None),
+                dhparams=self.ssl.get("dhparams", None),
+                chain_file=self.ssl.get("chain_file", None),
+                alpn_select=self.ssl.get("alpn_select", None)
+            )
+        h.handle()
+        h.finish()
+
+    def handle_error(self, connection, client_address, fp=None):
+        s = StringIO()
+        tcp.TCPServer.handle_error(self, connection, client_address, s)
+        self.q.put(s.getvalue())
+
+
+class ServerTestBase(object):
+    ssl = None
+    handler = None
+    addr = ("localhost", 0)
+
+    @classmethod
+    def setup_class(cls):
+        cls.q = queue.Queue()
+        s = cls.makeserver()
+        cls.port = s.address.port
+        cls.server = _ServerThread(s)
+        cls.server.start()
+
+    @classmethod
+    def makeserver(cls):
+        return _TServer(cls.ssl, cls.q, cls.handler, cls.addr)
+
+    @classmethod
+    def teardown_class(cls):
+        cls.server.shutdown()
+
+    @property
+    def last_handler(self):
+        return self.server.server.last_handler
diff --git a/test/netlib/websockets/test_websockets.py b/test/netlib/websockets/test_websockets.py
index d53f0d83..a7d782a4 100644
--- a/test/netlib/websockets/test_websockets.py
+++ b/test/netlib/websockets/test_websockets.py
@@ -2,12 +2,12 @@ import os
 
 from netlib.http.http1 import read_response, read_request
 
-from netlib import tcp, websockets, http, tutils, tservers
+from netlib import tcp, websockets, http, tutils
 from netlib.http import status_codes
 from netlib.tutils import treq
-
 from netlib.exceptions import *
 
+from .. import tservers
 
 class WebSocketsEchoHandler(tcp.BaseHandler):
 
diff --git a/test/pathod/test_app.py b/test/pathod/test_app.py
index 4536db8e..ac89c44c 100644
--- a/test/pathod/test_app.py
+++ b/test/pathod/test_app.py
@@ -21,7 +21,7 @@ class TestApp(tutils.DaemonTests):
         assert self.getpath("/docs/pathod").status_code == 200
         assert self.getpath("/docs/pathoc").status_code == 200
         assert self.getpath("/docs/language").status_code == 200
-        assert self.getpath("/docs/libpathod").status_code == 200
+        assert self.getpath("/docs/pathod").status_code == 200
         assert self.getpath("/docs/test").status_code == 200
 
     def test_log(self):
diff --git a/test/pathod/test_language_actions.py b/test/pathod/test_language_actions.py
index 755f0d85..1c404714 100644
--- a/test/pathod/test_language_actions.py
+++ b/test/pathod/test_language_actions.py
@@ -1,7 +1,7 @@
 import cStringIO
 
-from libpathod.language import actions
-from libpathod import language
+from pathod.language import actions
+from pathod import language
 
 
 def parse_request(s):
diff --git a/test/pathod/test_language_base.py b/test/pathod/test_language_base.py
index b18ee5b2..64d4af1f 100644
--- a/test/pathod/test_language_base.py
+++ b/test/pathod/test_language_base.py
@@ -1,6 +1,6 @@
 import os
-from libpathod import language
-from libpathod.language import base, exceptions
+from pathod import language
+from pathod.language import base, exceptions
 import tutils
 
 
diff --git a/test/pathod/test_language_generators.py b/test/pathod/test_language_generators.py
index 945560c3..0fceae85 100644
--- a/test/pathod/test_language_generators.py
+++ b/test/pathod/test_language_generators.py
@@ -1,6 +1,6 @@
 import os
 
-from libpathod.language import generators
+from pathod.language import generators
 import tutils
 
 
diff --git a/test/pathod/test_language_http.py b/test/pathod/test_language_http.py
index 26bb6a45..fd60c9fd 100644
--- a/test/pathod/test_language_http.py
+++ b/test/pathod/test_language_http.py
@@ -1,7 +1,7 @@
 import cStringIO
 
-from libpathod import language
-from libpathod.language import http, base
+from pathod import language
+from pathod.language import http, base
 import tutils
 
 
diff --git a/test/pathod/test_language_http2.py b/test/pathod/test_language_http2.py
index 9be49452..8e9f188c 100644
--- a/test/pathod/test_language_http2.py
+++ b/test/pathod/test_language_http2.py
@@ -4,8 +4,8 @@ import netlib
 from netlib import tcp
 from netlib.http import user_agents
 
-from libpathod import language
-from libpathod.language import http2, base
+from pathod import language
+from pathod.language import http2, base
 import tutils
 
 
diff --git a/test/pathod/test_language_websocket.py b/test/pathod/test_language_websocket.py
index d98fd33e..f1105dfe 100644
--- a/test/pathod/test_language_websocket.py
+++ b/test/pathod/test_language_websocket.py
@@ -1,6 +1,6 @@
 
-from libpathod import language
-from libpathod.language import websockets
+from pathod import language
+from pathod.language import websockets
 import netlib.websockets
 import tutils
 
diff --git a/test/pathod/test_language_writer.py b/test/pathod/test_language_writer.py
index 1a532903..1a4ac954 100644
--- a/test/pathod/test_language_writer.py
+++ b/test/pathod/test_language_writer.py
@@ -1,7 +1,7 @@
 import cStringIO
 
-from libpathod import language
-from libpathod.language import writer
+from pathod import language
+from pathod.language import writer
 
 
 def test_send_chunk():
diff --git a/test/pathod/test_log.py b/test/pathod/test_log.py
index 8f38c040..d91b8bb1 100644
--- a/test/pathod/test_log.py
+++ b/test/pathod/test_log.py
@@ -1,5 +1,5 @@
 import StringIO
-from libpathod import log
+from pathod import log
 from netlib.exceptions import TcpDisconnect
 import netlib.tcp
 
diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py
index 7c912773..23edd1d1 100644
--- a/test/pathod/test_pathoc.py
+++ b/test/pathod/test_pathoc.py
@@ -9,7 +9,7 @@ from netlib import tcp, http, socks
 from netlib.exceptions import HttpException, TcpException, NetlibException
 from netlib.http import http1, http2
 
-from libpathod import pathoc, test, version, pathod, language
+from pathod import pathoc, test, version, pathod, language
 from netlib.tutils import raises
 import tutils
 
diff --git a/test/pathod/test_pathoc_cmdline.py b/test/pathod/test_pathoc_cmdline.py
index 74dfef57..ab1438d1 100644
--- a/test/pathod/test_pathoc_cmdline.py
+++ b/test/pathod/test_pathoc_cmdline.py
@@ -1,4 +1,4 @@
-from libpathod import pathoc_cmdline as cmdline
+from pathod import pathoc_cmdline as cmdline
 import tutils
 import cStringIO
 import mock
diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py
index 6d1df74f..f8eb55f9 100644
--- a/test/pathod/test_pathod.py
+++ b/test/pathod/test_pathod.py
@@ -3,7 +3,7 @@ import cStringIO
 import OpenSSL
 import pytest
 
-from libpathod import pathod, version
+from pathod import pathod, version
 from netlib import tcp, http
 from netlib.exceptions import HttpException, TlsException
 import tutils
diff --git a/test/pathod/test_pathod_cmdline.py b/test/pathod/test_pathod_cmdline.py
index 829c4b32..d156bf50 100644
--- a/test/pathod/test_pathod_cmdline.py
+++ b/test/pathod/test_pathod_cmdline.py
@@ -1,4 +1,4 @@
-from libpathod import pathod_cmdline as cmdline
+from pathod import pathod_cmdline as cmdline
 import tutils
 import cStringIO
 import mock
diff --git a/test/pathod/test_test.py b/test/pathod/test_test.py
index bd92d864..cee286a4 100644
--- a/test/pathod/test_test.py
+++ b/test/pathod/test_test.py
@@ -1,6 +1,6 @@
 import logging
 import requests
-from libpathod import test
+from pathod import test
 import tutils
 logging.disable(logging.CRITICAL)
 
diff --git a/test/pathod/test_utils.py b/test/pathod/test_utils.py
index 7d24e9e4..4dcedf6e 100644
--- a/test/pathod/test_utils.py
+++ b/test/pathod/test_utils.py
@@ -1,4 +1,4 @@
-from libpathod import utils
+from pathod import utils
 import tutils
 
 
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 664cdd52..abe7a59b 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -6,7 +6,7 @@ import cStringIO
 from contextlib import contextmanager
 
 import netlib
-from libpathod import utils, test, pathoc, pathod, language
+from pathod import utils, test, pathoc, pathod, language
 from netlib import tcp
 import requests