diff --git a/setup.cfg b/setup.cfg
index 96c741b3c..0e31cf9b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ output_file = tripleoclient/locale/tripleoclient.pot
 openstack.cli.extension =
     tripleoclient = tripleoclient.plugin
 
-openstack.tripleoclient.v1 =
+openstack.tripleoclient.v2 =
     tripleo_config_generate_ansible = tripleoclient.v1.tripleo_config:GenerateAnsibleConfig
     tripleo_deploy = tripleoclient.v1.tripleo_deploy:Deploy
     tripleo_launch_heat = tripleoclient.v1.tripleo_launch_heat:LaunchHeat
diff --git a/tripleoclient/plugin.py b/tripleoclient/plugin.py
index 5f92c6976..165560e0e 100644
--- a/tripleoclient/plugin.py
+++ b/tripleoclient/plugin.py
@@ -28,13 +28,13 @@ from tripleoclient import exceptions
 
 LOG = logging.getLogger(__name__)
 
-DEFAULT_TRIPLEOCLIENT_API_VERSION = '1'
+DEFAULT_TRIPLEOCLIENT_API_VERSION = '2'
 
 # Required by the OSC plugin interface
 API_NAME = 'tripleoclient'
 API_VERSION_OPTION = 'os_tripleoclient_api_version'
 API_VERSIONS = {
-    '1': 'tripleoclient.plugin'
+    '2': 'tripleoclient.plugin'
 }
 
 
diff --git a/tripleoclient/tests/v2/__init__.py b/tripleoclient/tests/v2/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleoclient/v2/__init__.py b/tripleoclient/v2/__init__.py
new file mode 100644
index 000000000..e69de29bb