diff --git a/ipa_server/__init__.py b/ipaserver/__init__.py
similarity index 100%
rename from ipa_server/__init__.py
rename to ipaserver/__init__.py
diff --git a/ipa_server/conn.py b/ipaserver/conn.py
similarity index 100%
rename from ipa_server/conn.py
rename to ipaserver/conn.py
diff --git a/ipa_server/context.py b/ipaserver/context.py
similarity index 100%
rename from ipa_server/context.py
rename to ipaserver/context.py
diff --git a/ipa_server/ipaldap.py b/ipaserver/ipaldap.py
similarity index 100%
rename from ipa_server/ipaldap.py
rename to ipaserver/ipaldap.py
diff --git a/ipa_server/ipautil.py b/ipaserver/ipautil.py
similarity index 100%
rename from ipa_server/ipautil.py
rename to ipaserver/ipautil.py
diff --git a/ipa_server/mod_python_xmlrpc.py b/ipaserver/mod_python_xmlrpc.py
similarity index 100%
rename from ipa_server/mod_python_xmlrpc.py
rename to ipaserver/mod_python_xmlrpc.py
diff --git a/ipa_server/plugins/__init__.py b/ipaserver/plugins/__init__.py
similarity index 100%
rename from ipa_server/plugins/__init__.py
rename to ipaserver/plugins/__init__.py
diff --git a/ipa_server/plugins/b_ldap.py b/ipaserver/plugins/b_ldap.py
similarity index 100%
rename from ipa_server/plugins/b_ldap.py
rename to ipaserver/plugins/b_ldap.py
diff --git a/ipa_server/plugins/b_ra.py b/ipaserver/plugins/b_ra.py
similarity index 100%
rename from ipa_server/plugins/b_ra.py
rename to ipaserver/plugins/b_ra.py
diff --git a/ipa_server/rpc.py b/ipaserver/rpc.py
similarity index 100%
rename from ipa_server/rpc.py
rename to ipaserver/rpc.py
diff --git a/ipa_server/servercore.py b/ipaserver/servercore.py
similarity index 100%
rename from ipa_server/servercore.py
rename to ipaserver/servercore.py
diff --git a/ipa_server/test_client b/ipaserver/test_client
similarity index 100%
rename from ipa_server/test_client
rename to ipaserver/test_client
diff --git a/ipa_server/updates/automount.update b/ipaserver/updates/automount.update
similarity index 100%
rename from ipa_server/updates/automount.update
rename to ipaserver/updates/automount.update
diff --git a/ipa_server/updates/groupofhosts.update b/ipaserver/updates/groupofhosts.update
similarity index 100%
rename from ipa_server/updates/groupofhosts.update
rename to ipaserver/updates/groupofhosts.update
diff --git a/ipa_server/updates/host.update b/ipaserver/updates/host.update
similarity index 100%
rename from ipa_server/updates/host.update
rename to ipaserver/updates/host.update
diff --git a/tests/test_ipa_server/__init__.py b/tests/test_ipaserver/__init__.py
similarity index 100%
rename from tests/test_ipa_server/__init__.py
rename to tests/test_ipaserver/__init__.py
diff --git a/tests/test_ipa_server/test_rpc.py b/tests/test_ipaserver/test_rpc.py
similarity index 100%
rename from tests/test_ipa_server/test_rpc.py
rename to tests/test_ipaserver/test_rpc.py