diff --git a/nova-powervm/__init__.py b/nova_powervm/__init__.py
similarity index 100%
rename from nova-powervm/__init__.py
rename to nova_powervm/__init__.py
diff --git a/nova-powervm/tests/__init__.py b/nova_powervm/tests/__init__.py
similarity index 100%
rename from nova-powervm/tests/__init__.py
rename to nova_powervm/tests/__init__.py
diff --git a/nova-powervm/tests/virt/__init__.py b/nova_powervm/tests/virt/__init__.py
similarity index 100%
rename from nova-powervm/tests/virt/__init__.py
rename to nova_powervm/tests/virt/__init__.py
diff --git a/nova-powervm/tests/virt/powervm/__init__.py b/nova_powervm/tests/virt/powervm/__init__.py
similarity index 100%
rename from nova-powervm/tests/virt/powervm/__init__.py
rename to nova_powervm/tests/virt/powervm/__init__.py
diff --git a/nova-powervm/virt/__init__.py b/nova_powervm/virt/__init__.py
similarity index 100%
rename from nova-powervm/virt/__init__.py
rename to nova_powervm/virt/__init__.py
diff --git a/nova-powervm/virt/powervm/__init__.py b/nova_powervm/virt/powervm/__init__.py
similarity index 100%
rename from nova-powervm/virt/powervm/__init__.py
rename to nova_powervm/virt/powervm/__init__.py
diff --git a/setup.cfg b/setup.cfg
index 9b84f02d..b66d3751 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ classifier =
 
 [files]
 packages =
-    nova-powervm
+    nova_powervm
 
 [build_sphinx]
 source-dir = doc/source
@@ -30,15 +30,15 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = nova-powervm/locale
+directory = nova_powervm/locale
 domain = nova-powervm
 
 [update_catalog]
 domain = nova-powervm
-output_dir = nova-powervm/locale
-input_file = nova-powervm/locale/nova-powervm.pot
+output_dir = nova_powervm/locale
+input_file = nova_powervm/locale/nova-powervm.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = nova-powervm/locale/nova-powervm.pot
+output_file = nova_powervm/locale/nova-powervm.pot