diff --git a/ugly_hacks/santiago/gnupg_test.py b/ugly_hacks/santiago/gnupg_test.py
index d401833ed..ea98a6167 100644
--- a/ugly_hacks/santiago/gnupg_test.py
+++ b/ugly_hacks/santiago/gnupg_test.py
@@ -3,7 +3,7 @@ import sys
 sys.path.extend(["../..", ".",
                  "/home/nick/programs/python-gnupg/python-gnupg-0.2.9"])
 import gnupg
-import simple_santiago as SimpleSantiago
+import simplesantiago
 
 
 # important variables.
@@ -139,7 +139,7 @@ def unwrapper_test(data):
 
     # unwrap it!
 
-    dog = SimpleSantiago.PgpUnwrapper(str(data))
+    dog = simplesantiago.PgpUnwrapper(str(data))
 
     print "unwrapping..."
     for message in dog:
diff --git a/ugly_hacks/santiago/protocols/https.py b/ugly_hacks/santiago/protocols/https.py
index 37e99cba3..bb8a466b9 100644
--- a/ugly_hacks/santiago/protocols/https.py
+++ b/ugly_hacks/santiago/protocols/https.py
@@ -1,6 +1,6 @@
 """The HTTPS Santiago listener and sender."""
 
-from simple_santiago import SantiagoListener, SantiagoSender
+from simplesantiago import SantiagoListener, SantiagoSender
 
 import cherrypy
 import httplib, urllib
diff --git a/ugly_hacks/santiago/simplesantiago.py b/ugly_hacks/santiago/simplesantiago.py
index 7f1ae376d..78168b067 100644
--- a/ugly_hacks/santiago/simplesantiago.py
+++ b/ugly_hacks/santiago/simplesantiago.py
@@ -4,7 +4,7 @@
 
 Start me with:
 
-    $ python -i simple_santiago.py
+    $ python -i simplesantiago.py
 
 This will provide you with a running Santiago service.  The important tags in
 this file are:
diff --git a/ugly_hacks/santiago/start.sh b/ugly_hacks/santiago/start.sh
index 9ed97cb0d..18c2227b2 100644
--- a/ugly_hacks/santiago/start.sh
+++ b/ugly_hacks/santiago/start.sh
@@ -4,4 +4,4 @@ PYTHONPATH=$PYTHONPATH:../..
 PYTHONPATH=$PYTHONPATH:/home/nick/programs/python-gnupg/python-gnupg-0.2.9
 export PYTHONPATH
 
-python simple_santiago.py
+python simplesantiago.py
diff --git a/ugly_hacks/santiago/test_santiago.py b/ugly_hacks/santiago/test_santiago.py
index d81fcd703..817cd28cb 100644
--- a/ugly_hacks/santiago/test_santiago.py
+++ b/ugly_hacks/santiago/test_santiago.py
@@ -326,5 +326,5 @@ class TestSimpleSantiago(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    # os.fork("python simple_santiago.py")
+    # os.fork("python simplesantiago.py")
     unittest.main()