diff --git a/roles/bodhi2/base/templates/bodhi-app.conf b/roles/bodhi2/base/templates/bodhi-app.conf
index 1d71286d43..00a1216ff3 100644
--- a/roles/bodhi2/base/templates/bodhi-app.conf
+++ b/roles/bodhi2/base/templates/bodhi-app.conf
@@ -1,4 +1,4 @@
-Alias /static /usr/lib/python2.7/site-packages/bodhi/static/
+Alias /static /usr/lib/python2.7/site-packages/bodhi/server/static/
 
 <FilesMatch ".(eot|ttf|otf|woff)">
     # modern browsers require that fonts have this
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 3af5d5edae..b3d6d0218a 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -4,7 +4,7 @@ prefix = /
 scheme = https
 
 [app:main]
-use = egg:bodhi
+use = egg:bodhi-server
 filter-with = proxy-prefix
 
 # Release status
@@ -393,7 +393,7 @@ updateinfo_rights = Copyright (C) 2015 Red Hat, Inc. and others.
 ##
 
 # pyramid.openid
-openid.success_callback = bodhi.security:remember_me
+openid.success_callback = bodhi.server.security:remember_me
 openid.provider = https://id.fedoraproject.org/openid/
 openid.url = https://id.fedoraproject.org/
 openid_template = {username}.id.fedoraproject.org
@@ -429,7 +429,7 @@ sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi/bodhi2
 ##
 ## Templates
 ##
-mako.directories = bodhi:templates
+mako.directories = bodhi:server/templates
 
 ##
 ## Authentication & Sessions
@@ -458,8 +458,8 @@ host = 0.0.0.0
 port = 6543
 
 [pshell]
-m = bodhi.models
-#db = bodhi.models.DBSession
+m = bodhi.server.models
+#db = bodhi.server.models.DBSession
 t = transaction
 
 # Begin logging configuration
diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2
index 9f0a89b3bd..10c2004193 100644
--- a/roles/bodhi2/base/templates/staging.ini.j2
+++ b/roles/bodhi2/base/templates/staging.ini.j2
@@ -4,7 +4,7 @@ prefix = /
 scheme = https
 
 [app:main]
-use = egg:bodhi
+use = egg:bodhi-server
 filter-with = proxy-prefix
 
 ##
@@ -366,7 +366,7 @@ updateinfo_rights = Copyright (C) 2015 Red Hat, Inc. and others.
 ##
 
 # pyramid.openid
-openid.success_callback = bodhi.security:remember_me
+openid.success_callback = bodhi.server.security:remember_me
 openid.provider = https://id.stg.fedoraproject.org/openid/
 openid.url = https://id.stg.fedoraproject.org/
 openid_template = {username}.id.fedoraproject.org
@@ -402,7 +402,7 @@ sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db-bodhi/bodhi2
 ##
 ## Templates
 ##
-mako.directories = bodhi:templates
+mako.directories = bodhi:server/templates
 
 ##
 ## Authentication & Sessions
@@ -432,8 +432,8 @@ port = 6543
 
 
 [pshell]
-m = bodhi.models
-db = bodhi.models.DBSession
+m = bodhi.server.models
+db = bodhi.server.models.DBSession
 t = transaction
 
 # Begin logging configuration