diff --git a/badmath/Gyopi.py b/badmath/Gyopi.py
index 6fd2eb7..47cef85 100644
--- a/badmath/Gyopi.py
+++ b/badmath/Gyopi.py
@@ -11,10 +11,11 @@ try:
 except:
     import sys
     sys.path.append('/home/pflarr/repos/gctf/')
-    from ctf.flagd import Flagger, irc
+    from ctf.flagd import Flagger
+    from ctf import irc
 
 class Gyopi(irc.Bot):
-    STATE_FN = 'pi.state'
+    STATE_FN = 'badmath.state'
 
     SALT = b'this is questionable.'
 
diff --git a/badmath/pi.state b/badmath/badmath.state
similarity index 100%
rename from badmath/pi.state
rename to badmath/badmath.state
diff --git a/roshambo/roshambo.py b/roshambo/roshambo.py
index db22462..14b917c 100755
--- a/roshambo/roshambo.py
+++ b/roshambo/roshambo.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 
-import game
+from ctf import game
 
 class Roshambo(game.TurnBasedGame):
     def setup(self):