diff --git a/README.rst b/README.rst
index fccf934..1d21b60 100644
--- a/README.rst
+++ b/README.rst
@@ -17,10 +17,10 @@ speedtest.net
 Versions
 --------
 
-speedtest-cli works with Python 2.4-3.4
+`speedtest` works with Python 2.4-3.4
 
-.. image:: https://img.shields.io/pypi/pyversions/speedtest-cli.svg
-        :target: https://pypi.python.org/pypi/speedtest-cli/
+.. image:: https://img.shields.io/pypi/pyversions/speedtest.svg
+        :target: https://pypi.python.org/pypi/speedtest/
         :alt: Versions
 
 Installation
@@ -58,23 +58,23 @@ Just download (Like the way it used to be)
 
 ::
 
-    wget -O speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest_cli.py
-    chmod +x speedtest-cli
+    wget -O speedtest https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
+    chmod +x speedtest
 
 or
 
 ::
 
-    curl -Lo speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest_cli.py
-    chmod +x speedtest-cli
+    curl -Lo speedtest https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
+    chmod +x speedtest
 
 Usage
 -----
 
 ::
 
-    $ speedtest-cli -h
-    usage: speedtest-cli [-h] [--bytes] [--share] [--simple] [--list]
+    $ speedtest -h
+    usage: speedtest [-h] [--bytes] [--share] [--simple] [--list]
                          [--server SERVER] [--mini MINI] [--source SOURCE]
                          [--timeout TIMEOUT] [--secure] [--version]
 
diff --git a/setup.py b/setup.py
index 6993e1f..6086b72 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,8 @@ except:
 
 
 setup(
-    name='speedtest-cli',
-    version=find_version('speedtest_cli.py'),
+    name='speedtest',
+    version=find_version('speedtest.py'),
     description=('Command line interface for testing internet bandwidth using '
                  'speedtest.net'),
     long_description=long_description,
@@ -66,11 +66,10 @@ setup(
     author_email='matt@sivel.net',
     url='https://github.com/sivel/speedtest-cli',
     license='Apache License, Version 2.0',
-    py_modules=['speedtest_cli'],
+    py_modules=['speedtest'],
     entry_points={
         'console_scripts': [
-            'speedtest=speedtest_cli:main',
-            'speedtest-cli=speedtest_cli:main'
+            'speedtest=speedtest:main'
         ]
     },
     classifiers=[
diff --git a/speedtest-cli.1 b/speedtest.1
similarity index 85%
rename from speedtest-cli.1
rename to speedtest.1
index eb20ea7..1ecf16d 100644
--- a/speedtest-cli.1
+++ b/speedtest.1
@@ -1,8 +1,8 @@
-.TH "speedtest-cli" 1 "2014-04-23" "speedtest-cli"
+.TH "speedtest" 1 "2014-04-23" "speedtest"
 .SH NAME
-speedtest\-cli \- Test your bandwidth througput using speedtest.net
+speedtest \- Test your bandwidth througput using speedtest.net
 .SH SYNOPSIS
-.B speedtest\-cli
+.B speedtest
 [OPTION]...
 .SH DESCRIPTION
 Speedtest.net is a web service for testing your broadband connection by downloading a file
@@ -12,7 +12,7 @@ from the command line.
 Speedtest mini is a version of the Speedtest.net server that you can host locally.
 
 .SH OPTIONS
-Usage: speedtest\-cli [OPTION...]
+Usage: speedtest [OPTION...]
 
 .B Help Options
 
@@ -67,17 +67,17 @@ Show the version number and exit
 
 \fBAutomatically find closest server and start testing\fR
 .RS
-speedtest\-cli
+speedtest
 .RE
 
 \fBSpecify testing against server 1491\fR
 .RS
-speedtest-cli \-\-server 1491
+speedtest \-\-server 1491
 .RE
 
 \fBTesting against Speedtest Mini\fR
 .RS
-speedtest-cli \-\-mini 172.18.66.1
+speedtest \-\-mini 172.18.66.1
 .RE
 
 .SH REPORTING BUGS
diff --git a/speedtest_cli.py b/speedtest.py
similarity index 99%
rename from speedtest_cli.py
rename to speedtest.py
index d93d5c3..11c65fd 100755
--- a/speedtest_cli.py
+++ b/speedtest.py
@@ -197,7 +197,7 @@ def build_user_agent():
         '(%s; U; %s; en-us)' % (platform.system(), platform.architecture()[0]),
         'Python/%s' % platform.python_version(),
         '(KHTML, like Gecko)',
-        'speedtest-cli/%s' % __version__
+        'speedtest/%s' % __version__
     )
     user_agent = ' '.join(ua_tuple)
     return user_agent
@@ -560,7 +560,7 @@ def speedtest():
         'speedtest.net.\n'
         '------------------------------------------------------------'
         '--------------\n'
-        'https://github.com/sivel/speedtest-cli')
+        'https://github.com/sivel/speedtest')
 
     parser = ArgParser(description=description)
     # Give optparse.OptionParser an `add_argument` method for
diff --git a/tox.ini b/tox.ini
index 3a17c18..477fa1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,18 +4,18 @@ skipsdist=true
 [testenv]
 commands =
     {envpython} -V
-    {envpython} -m compileall speedtest_cli.py
-    {envpython} speedtest_cli.py
+    {envpython} -m compileall speedtest.py
+    {envpython} speedtest.py
 
 [testenv:flake8]
 basepython=python
 deps=flake8
 commands =
     {envpython} -V
-    flake8 speedtest_cli.py
+    flake8 speedtest.py
 
 [testenv:pypy]
 commands =
     pypy -V
-    pypy -m compileall speedtest_cli.py
-    pypy speedtest_cli.py
+    pypy -m compileall speedtest.py
+    pypy speedtest.py