diff --git a/MANIFEST.in b/MANIFEST.in
index d680de9..9635541 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-recursive-include byro-schaffenburg/static *
-recursive-include byro-schaffenburg/templates *
-recursive-include byro-schaffenburg/locale *
+recursive-include byro_schaffenburg/static *
+recursive-include byro_schaffenburg/templates *
+recursive-include byro_schaffenburg/locale *
diff --git a/byro-schaffenburg/__init__.py b/byro_schaffenburg/__init__.py
similarity index 85%
rename from byro-schaffenburg/__init__.py
rename to byro_schaffenburg/__init__.py
index 885737d..99dcca9 100644
--- a/byro-schaffenburg/__init__.py
+++ b/byro_schaffenburg/__init__.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy
 
 
 class PluginApp(AppConfig):
-    name = 'byro-schaffenburg'
+    name = 'byro_schaffenburg'
     verbose_name = 'Schaffenburg e.V. Byro Plugin'
 
     class ByroPluginMeta:
@@ -17,4 +17,4 @@ class PluginApp(AppConfig):
         from . import signals  # NOQA
 
 
-default_app_config = 'byro-schaffenburg.PluginApp'
+default_app_config = 'byro_schaffenburg.PluginApp'
diff --git a/byro-schaffenburg/locale/de/LC_MESSAGES/django.po b/byro_schaffenburg/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from byro-schaffenburg/locale/de/LC_MESSAGES/django.po
rename to byro_schaffenburg/locale/de/LC_MESSAGES/django.po
diff --git a/byro-schaffenburg/models.py b/byro_schaffenburg/models.py
similarity index 100%
rename from byro-schaffenburg/models.py
rename to byro_schaffenburg/models.py
diff --git a/byro-schaffenburg/pylama.ini b/byro_schaffenburg/pylama.ini
similarity index 100%
rename from byro-schaffenburg/pylama.ini
rename to byro_schaffenburg/pylama.ini
diff --git a/byro-schaffenburg/signals.py b/byro_schaffenburg/signals.py
similarity index 100%
rename from byro-schaffenburg/signals.py
rename to byro_schaffenburg/signals.py
diff --git a/byro-schaffenburg/static/byro-schaffenburg/.gitkeep b/byro_schaffenburg/static/byro_schaffenburg/.gitkeep
similarity index 100%
rename from byro-schaffenburg/static/byro-schaffenburg/.gitkeep
rename to byro_schaffenburg/static/byro_schaffenburg/.gitkeep
diff --git a/byro-schaffenburg/templates/byro-schaffenburg/.gitkeep b/byro_schaffenburg/templates/byro_schaffenburg/.gitkeep
similarity index 100%
rename from byro-schaffenburg/templates/byro-schaffenburg/.gitkeep
rename to byro_schaffenburg/templates/byro_schaffenburg/.gitkeep
diff --git a/setup.py b/setup.py
index aec9bd7..258d766 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,6 @@ setup(
     cmdclass=cmdclass,
     entry_points="""
 [byro.plugin]
-byro-schaffenburg=byro-schaffenburg:ByroPluginMeta
+byro_schaffenburg=byro_schaffenburg:ByroPluginMeta
 """,
 )