diff --git a/app.yaml.sample b/app.yaml.sample
index 460b0a1fd2046698266557d0a9d040149045cc6e..6b2f9d7e06610b8aefc1285b338f64f818913b3c 100644
--- a/app.yaml.sample
+++ b/app.yaml.sample
@@ -19,13 +19,13 @@ handlers:
   secure: always
   
 - url: /static
-  static_dir: server-ui/media
+  static_dir: server_ui/media
   secure: always
 
 # this overrides the style for the booth
 # without having to fork the code
 - url: /booth/css
-  static_dir: server-ui/media/boothcss
+  static_dir: server_ui/media/boothcss
   secure: always
   
 - url: /booth
diff --git a/initialization.py.sample b/initialization.py.sample
index 06e4abfc3e91a4af0c3b702d880a91f03d004ca9..10b00b84df662ab661f3ab2ad42d025abdd0a81f 100644
--- a/initialization.py.sample
+++ b/initialization.py.sample
@@ -7,9 +7,9 @@ import helios
 import auth
 import auth.models
 
-#from server-ui import glue
+#from server_ui import glue
 
-helios.TEMPLATE_BASE = "server-ui/templates/base.html"
+helios.TEMPLATE_BASE = "server_ui/templates/base.html"
 helios.ADMIN_ONLY = True
 helios.ADMIN = auth.models.User.get_or_create(user_type = 'cas', user_id = 'yaro', info={})
 
diff --git a/server-ui/__init__.py b/server_ui/__init__.py
similarity index 100%
rename from server-ui/__init__.py
rename to server_ui/__init__.py
diff --git a/server-ui/glue.py b/server_ui/glue.py
similarity index 82%
rename from server-ui/glue.py
rename to server_ui/glue.py
index 1af91cd453c45e4cb2cdf2117dd5fde35a0e5b36..c4abbdc09c05a3db70a79d99239174274f16812f 100644
--- a/server-ui/glue.py
+++ b/server_ui/glue.py
@@ -9,7 +9,7 @@ import helios.views, helios.signals
 
 import views
 
-def vote_cast_update_status(user, voter, election, cast_vote, **kwargs):
+def vote_cast_send_message(user, voter, election, cast_vote, **kwargs):
   # prepare the message
   subject = "%s - vote cast" % election.name
   
@@ -21,7 +21,7 @@ You have successfully cast a vote in
 Your ballot tracking number is:
 
   %s
-""" % (election.name, cast_vote.vote_hash
+""" % (election.name, cast_vote.vote_hash)
   
   if election.use_voter_aliases:
     body += """
@@ -39,7 +39,7 @@ Your voter alias is : %s
   # send it via the notification system associated with the auth system
   user.send_message(subject, body)
   
-helios.signals.vote_cast.connect(vote_cast_update_status)
+helios.signals.vote_cast.connect(vote_cast_send_message)
 
 def election_tallied(election, **kwargs):
   pass
diff --git a/server-ui/media/.gitignore b/server_ui/media/.gitignore
similarity index 100%
rename from server-ui/media/.gitignore
rename to server_ui/media/.gitignore
diff --git a/server-ui/media/boothcss/booth.css b/server_ui/media/boothcss/booth.css
similarity index 100%
rename from server-ui/media/boothcss/booth.css
rename to server_ui/media/boothcss/booth.css
diff --git a/server-ui/media/boothcss/forms.css b/server_ui/media/boothcss/forms.css
similarity index 100%
rename from server-ui/media/boothcss/forms.css
rename to server_ui/media/boothcss/forms.css
diff --git a/server-ui/media/footer-logo.gif.sample b/server_ui/media/footer-logo.gif.sample
similarity index 100%
rename from server-ui/media/footer-logo.gif.sample
rename to server_ui/media/footer-logo.gif.sample
diff --git a/server-ui/media/logo.gif.sample b/server_ui/media/logo.gif.sample
similarity index 100%
rename from server-ui/media/logo.gif.sample
rename to server_ui/media/logo.gif.sample
diff --git a/server-ui/media/main.css b/server_ui/media/main.css
similarity index 100%
rename from server-ui/media/main.css
rename to server_ui/media/main.css
diff --git a/server-ui/templates/base.html b/server_ui/templates/base.html
similarity index 100%
rename from server-ui/templates/base.html
rename to server_ui/templates/base.html
diff --git a/server-ui/templates/confirm.html b/server_ui/templates/confirm.html
similarity index 90%
rename from server-ui/templates/confirm.html
rename to server_ui/templates/confirm.html
index 375149028f549c1cb7f26de59432370f31401a59..4ff6edb6af9dd215ab3302ea51893e531f31b066 100644
--- a/server-ui/templates/confirm.html
+++ b/server_ui/templates/confirm.html
@@ -1,4 +1,4 @@
-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}Confirm Vote{% endblock %}
 
 {% block content %}
@@ -38,7 +38,7 @@ function show_waiting() {
 </form>
 
 <p>
-    Forgot your password? <a href="{% url auth.auth_systems.password.password_forgotten_view %}?return_url={% url server-ui.views.cast_confirm %}">Have it emailed to you</a>.<br />(don't worry, we won't forget your vote).
+    Forgot your password? <a href="{% url auth.auth_systems.password.password_forgotten_view %}?return_url={% url server_ui.views.cast_confirm %}">Have it emailed to you</a>.<br />(don't worry, we won't forget your vote).
 </p>
 </div>
 
diff --git a/server-ui/templates/done.html b/server_ui/templates/done.html
similarity index 89%
rename from server-ui/templates/done.html
rename to server_ui/templates/done.html
index 9b3a2b3b236acf1b1283b4a7ae1dfd7b53344d77..f1bce76d12eacdcf3672c7f6bf871f6e9bbfe23e 100644
--- a/server-ui/templates/done.html
+++ b/server_ui/templates/done.html
@@ -1,4 +1,4 @@
-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}Confirm Vote{% endblock %}
 
 {% block content %}
diff --git a/server-ui/templates/election_tallied.html b/server_ui/templates/election_tallied.html
similarity index 88%
rename from server-ui/templates/election_tallied.html
rename to server_ui/templates/election_tallied.html
index 3a81953ba0eaa13c4757d33b476fe31d9656abd1..45e7b08383444e8da5ba2ae7578d55a19cd4a6c2 100644
--- a/server-ui/templates/election_tallied.html
+++ b/server_ui/templates/election_tallied.html
@@ -1,4 +1,4 @@
-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 
 {% block content %}
 
diff --git a/server-ui/templates/index.html b/server_ui/templates/index.html
similarity index 93%
rename from server-ui/templates/index.html
rename to server_ui/templates/index.html
index e0f4549946094eff4fe3351d021505a2f894ba8c..5c0913dca1127d3db0fe5479e259ae7a027ed104 100644
--- a/server-ui/templates/index.html
+++ b/server_ui/templates/index.html
@@ -1,4 +1,4 @@
-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}{{ settings.SITE_TITLE }}{% endblock %}
 
 {% block header %}
diff --git a/server-ui/urls.py b/server_ui/urls.py
similarity index 100%
rename from server-ui/urls.py
rename to server_ui/urls.py
diff --git a/server-ui/view_utils.py b/server_ui/view_utils.py
similarity index 91%
rename from server-ui/view_utils.py
rename to server_ui/view_utils.py
index 9a5b655eda6ae8c1cb77bbb992cfc4ca2bb58534..9b7cfd83819866d14866389ff2e5ecd02d222b77 100644
--- a/server-ui/view_utils.py
+++ b/server_ui/view_utils.py
@@ -26,5 +26,5 @@ def render_template(request, template_name, vars = {}):
   if request.session.has_key('csrf_token'):
     vars_with_user['csrf_token'] = request.session['csrf_token']
   
-  return render_to_response('server-ui/templates/%s.html' % template_name, vars_with_user)
+  return render_to_response('server_ui/templates/%s.html' % template_name, vars_with_user)
   
diff --git a/server-ui/views.py b/server_ui/views.py
similarity index 99%
rename from server-ui/views.py
rename to server_ui/views.py
index 24908eea307b852745af2d86a9ba8d8703ff705c..b296f5a149a716298cf4f9f919a2e1a57e57e46e 100644
--- a/server-ui/views.py
+++ b/server_ui/views.py
@@ -1,5 +1,5 @@
 """
-server-ui specific views
+server_ui specific views
 """
 
 from helios.models import *
diff --git a/settings.py.sample b/settings.py.sample
index 00b472710a254898ab544d7664da8cc0e1915847..844c411d658ff6f0ba0a6b232eec49bd04bd6bab 100644
--- a/settings.py.sample
+++ b/settings.py.sample
@@ -117,7 +117,7 @@ INSTALLED_APPS = (
     'appengine_django',
     'auth',
     'helios',
-    'server-ui',
+    'server_ui',
 )
 
 
diff --git a/urls.py b/urls.py
index eb46fe6699dbe374227c8503b8e39a534c46e6f6..8fd7a71a2c467bac9aace78bdc29fac30bf41d40 100644
--- a/urls.py
+++ b/urls.py
@@ -5,5 +5,5 @@ from django.contrib import admin
 urlpatterns = patterns('',
     (r'^auth/', include('auth.urls')),
     (r'^helios/', include('helios.urls')),
-    (r'^', include('server-ui.urls')),
+    (r'^', include('server_ui.urls')),
 )
\ No newline at end of file