diff --git a/README.md b/README.md
index 3dd01e5..be2f6c8 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Basic usage can be grasped from the test suit.
 
 Import the module in your script and you are good to go:
 
-   >>> import blender_file
+   >>> import blendfile
 
 This module supports both Python2.x and Python3.x at the moment.
 Python 2.x support may be dropped in the future.
diff --git a/blender_file/__init__.py b/blendfile/__init__.py
similarity index 100%
rename from blender_file/__init__.py
rename to blendfile/__init__.py
diff --git a/setup.py b/setup.py
index 621a5b7..cb673b9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,14 @@
 from setuptools import setup
 
 setup(
-    name='blender_file',
+    name='blender-file',
     version='1.0',
     description='Blender File',
     url='https://developer.blender.org/diffusion/BBF/',
     author='At Mind B.V. - Jeroen Bakker, Blender Foundation - Campbell Barton',
     author_email='foundation@blender.org',
     license='GNU General Public License v2 or later (GPLv2+)',
-    packages=['blender_file'],
+    packages=setuptools.find_packages('.', exclude=['tests']),
     tests_require=[
         'pytest',
     ],
diff --git a/tests/test_all.py b/tests/test_all.py
index 14abee2..58db26e 100644
--- a/tests/test_all.py
+++ b/tests/test_all.py
@@ -2,7 +2,7 @@
 """Unitests for blender_format"""
 
 import os
-import blender_file
+import blendfile
 
 # Utils
 
@@ -29,7 +29,7 @@ def views_iter(scene):
 
 def query_main_scene(filepath, callbacks):
     """Return the equivalent to bpy.context.scene"""
-    with blender_file.open_blend(filepath) as blend:
+    with blendfile.open_blend(filepath) as blend:
         # There is no bpy.context.scene, we get it from the main window
         window_manager = [block for block in blend.blocks if block.code == b'WM'][0]
         window = window_manager.get_pointer(b'winactive')