diff --git a/pankoclient/tests/unit/base.py b/pankoclient/tests/unit/base.py
index 37b0c40..f480a0c 100644
--- a/pankoclient/tests/unit/base.py
+++ b/pankoclient/tests/unit/base.py
@@ -24,11 +24,11 @@ class TestBase(utils.TestCommand):
     pass
 
 
-class TestBaremetalComputeV1(TestBase):
-    """Test case base class for the unit tests of Baremetal Compute V1 API."""
+class TestEventV2(TestBase):
+    """Test case base class for the unit tests of Event server V1 API."""
 
     def setUp(self):
-        super(TestBaremetalComputeV1, self).setUp()
+        super(TestEventV2, self).setUp()
 
-        fake_client = fakes.FakeBaremetalComputeV1Client()
+        fake_client = fakes.FakeTestEventV2Client()
         self.app.client_manager.event = fake_client
diff --git a/pankoclient/tests/unit/fakes.py b/pankoclient/tests/unit/fakes.py
index 0bb8146..c1a1b13 100644
--- a/pankoclient/tests/unit/fakes.py
+++ b/pankoclient/tests/unit/fakes.py
@@ -50,7 +50,7 @@ def create_resource_manager():
     return FakeManager()
 
 
-class FakeBaremetalComputeV1Client(object):
+class FakeTestEventV2Client(object):
 
     def __init__(self, **kwargs):
         self.fake_http_client = mock.Mock()
diff --git a/pankoclient/tests/unit/osc/test_plugin.py b/pankoclient/tests/unit/osc/test_plugin.py
index ada7523..193ec4e 100644
--- a/pankoclient/tests/unit/osc/test_plugin.py
+++ b/pankoclient/tests/unit/osc/test_plugin.py
@@ -21,9 +21,9 @@ from pankoclient.osc import plugin
 from pankoclient.tests.unit import base
 
 
-class TestBaremetalComputePlugin(base.TestBase):
+class TestEventPlugin(base.TestBase):
 
-    @mock.patch('pankoclient.v1.client.Client')
+    @mock.patch('pankoclient.v2.client.Client')
     def test_make_client_with_session(self, panko_client):
         instance = mock.Mock()
         instance._api_version = {
@@ -50,7 +50,7 @@ class TestBaremetalComputePlugin(base.TestBase):
             session='fake_session',
         )
 
-    @mock.patch('pankoclient.v1.client.Client')
+    @mock.patch('pankoclient.v2.client.Client')
     def test_make_client_no_session(self, panko_client):
         instance = mock.Mock()
         instance._api_version = {
diff --git a/pankoclient/tests/unit/osc/v1/__init__.py b/pankoclient/tests/unit/osc/v2/__init__.py
similarity index 100%
rename from pankoclient/tests/unit/osc/v1/__init__.py
rename to pankoclient/tests/unit/osc/v2/__init__.py
diff --git a/pankoclient/v2/client.py b/pankoclient/v2/client.py
index e2a9589..170b1c0 100644
--- a/pankoclient/v2/client.py
+++ b/pankoclient/v2/client.py
@@ -22,7 +22,7 @@ class Client(object):
     """Client for the Panko v2 API."""
 
     def __init__(self, *args, **kwargs):
-        """Initialize a new client for the Panko v1 API."""
+        """Initialize a new client for the Panko v2 API."""
         self.http_client = http._construct_http_client(*args, **kwargs)
         self.capabilities = capabilities.CapabilitiesManager(self.http_client)
         self.event = events.EventManager(self.http_client)