diff --git a/ugly_hacks/santiago/gnupg_test.py b/ugly_hacks/santiago/gnupg_test.py
index 4fb779ff2..f9228171f 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 simplesantiago
+import santiago
 
 
 # important variables.
@@ -157,7 +157,7 @@ def unwrapper_test(data):
 
     # unwrap it!
 
-    dog = simplesantiago.PgpUnwrapper(str(data))
+    dog = santiago.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 5bd52ec58..209c47f8c 100644
--- a/ugly_hacks/santiago/protocols/https.py
+++ b/ugly_hacks/santiago/protocols/https.py
@@ -75,11 +75,11 @@ class Sender(SantiagoSender):
 
         ``request`` is literally the request's text.  It needs to be wrapped for
         transport across the protocol.
-        
+
         """
         logging.debug("protocols.https.Sender.outgoing_request: request {0}".format(str(request)))
         to_send = { "request": request }
-        
+
         params = urllib.urlencode(to_send)
         logging.debug("protocols.https.Sender.outgoing_request: params {0}".format(str(params)))
 
diff --git a/ugly_hacks/santiago/start.sh b/ugly_hacks/santiago/start.sh
index 18c2227b2..25ff9e93b 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 simplesantiago.py
+python santiago.py
diff --git a/ugly_hacks/santiago/test_santiago.py b/ugly_hacks/santiago/test_santiago.py
index b02d4fdb8..be2c49c20 100644
--- a/ugly_hacks/santiago/test_santiago.py
+++ b/ugly_hacks/santiago/test_santiago.py
@@ -46,7 +46,7 @@ import unittest
 import ast
 import gnupg
 import logging
-import simplesantiago as santiago
+import santiago
 import utilities