diff --git a/README.md b/README.md
index ab54d5285..11fcbad2f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 **Warning:** This readme is for the development version of docker-py, which is significantly different to the stable version. [Documentation for the stable version is here.](https://docker-py.readthedocs.io/)
 
-A Python library for the Docker API. It lets you do anything the `docker` command does, but from within Python apps – run containers, manage containers, manage Swarms, etc.
+A Python library for the Docker Engine API. It lets you do anything the `docker` command does, but from within Python apps – run containers, manage containers, manage Swarms, etc.
 
 ## Installation
 
diff --git a/docker/version.py b/docker/version.py
index 3bbd80456..ab6838fb9 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.11.0-dev"
+version = "2.0.0-dev"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/setup.py b/setup.py
index 89c97c87b..edf4b0e50 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 import os
 import sys
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 ROOT_DIR = os.path.dirname(__file__)
@@ -43,22 +43,19 @@
     pass
 
 setup(
-    name="docker-py",
+    name="docker",
     version=version,
-    description="Python client for Docker.",
+    description="A Python library for the Docker Engine API.",
     long_description=long_description,
-    url='https://github.com/docker/docker-py/',
-    packages=[
-        'docker', 'docker.api', 'docker.transport', 'docker.utils',
-        'docker.types',
-    ],
+    url='https://github.com/docker/docker-py',
+    packages=find_packages(exclude=["tests.*", "tests"]),
     install_requires=requirements,
     tests_require=test_requirements,
     extras_require=extras_require,
     zip_safe=False,
     test_suite='tests',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Other Environment',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',