diff --git a/oslo_db/_i18n.py b/oslo_db/_i18n.py
index 809076e..8bcb7ca 100644
--- a/oslo_db/_i18n.py
+++ b/oslo_db/_i18n.py
@@ -19,7 +19,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 import oslo_i18n
 
 
-_translators = oslo_i18n.TranslatorFactory(domain='oslo.db')
+_translators = oslo_i18n.TranslatorFactory(domain='oslo_db')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po
similarity index 100%
rename from oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po
rename to oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-error.po
diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po
similarity index 100%
rename from oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po
rename to oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-info.po
diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po
similarity index 100%
rename from oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po
rename to oslo_db/locale/en_GB/LC_MESSAGES/oslo_db-log-warning.po
diff --git a/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po b/oslo_db/locale/en_GB/LC_MESSAGES/oslo_db.po
similarity index 100%
rename from oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po
rename to oslo_db/locale/en_GB/LC_MESSAGES/oslo_db.po
diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po
similarity index 100%
rename from oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po
rename to oslo_db/locale/es/LC_MESSAGES/oslo_db-log-error.po
diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po
similarity index 100%
rename from oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po
rename to oslo_db/locale/es/LC_MESSAGES/oslo_db-log-info.po
diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po
similarity index 100%
rename from oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po
rename to oslo_db/locale/es/LC_MESSAGES/oslo_db-log-warning.po
diff --git a/oslo.db/locale/es/LC_MESSAGES/oslo.db.po b/oslo_db/locale/es/LC_MESSAGES/oslo_db.po
similarity index 100%
rename from oslo.db/locale/es/LC_MESSAGES/oslo.db.po
rename to oslo_db/locale/es/LC_MESSAGES/oslo_db.po
diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po
similarity index 100%
rename from oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po
rename to oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-error.po
diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po
similarity index 100%
rename from oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po
rename to oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-info.po
diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po
similarity index 100%
rename from oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po
rename to oslo_db/locale/fr/LC_MESSAGES/oslo_db-log-warning.po
diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po b/oslo_db/locale/fr/LC_MESSAGES/oslo_db.po
similarity index 100%
rename from oslo.db/locale/fr/LC_MESSAGES/oslo.db.po
rename to oslo_db/locale/fr/LC_MESSAGES/oslo_db.po
diff --git a/oslo.db/locale/oslo.db-log-error.pot b/oslo_db/locale/oslo_db-log-error.pot
similarity index 100%
rename from oslo.db/locale/oslo.db-log-error.pot
rename to oslo_db/locale/oslo_db-log-error.pot
diff --git a/oslo.db/locale/oslo.db-log-info.pot b/oslo_db/locale/oslo_db-log-info.pot
similarity index 100%
rename from oslo.db/locale/oslo.db-log-info.pot
rename to oslo_db/locale/oslo_db-log-info.pot
diff --git a/oslo.db/locale/oslo.db-log-warning.pot b/oslo_db/locale/oslo_db-log-warning.pot
similarity index 100%
rename from oslo.db/locale/oslo.db-log-warning.pot
rename to oslo_db/locale/oslo_db-log-warning.pot
diff --git a/oslo.db/locale/oslo.db.pot b/oslo_db/locale/oslo_db.pot
similarity index 100%
rename from oslo.db/locale/oslo.db.pot
rename to oslo_db/locale/oslo_db.pot
diff --git a/setup.cfg b/setup.cfg
index d4ce0dc..b9ed86d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -73,18 +73,18 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = oslo.db/locale
-domain = oslo.db
+directory = oslo_db/locale
+domain = oslo_db
 
 [update_catalog]
-domain = oslo.db
-output_dir = oslo.db/locale
-input_file = oslo.db/locale/oslo.db.pot
+domain = oslo_db
+output_dir = oslo_db/locale
+input_file = oslo_db/locale/oslo_db.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = oslo.db/locale/oslo.db.pot
+output_file = oslo_db/locale/oslo_db.pot
 
 [pbr]
 warnerrors = True