diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 6f27a08d..d45f1f6e 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -7,7 +7,7 @@ sugar_PYTHON =				\
 	env.py				\
 	logger.py			\
 	setup.py			\
-	simulator.py			\
+	oldsimulator.py			\
 	TracebackUtils.py		\
 	util.py
 
diff --git a/sugar/simulator.py b/sugar/oldsimulator.py
similarity index 100%
rename from sugar/simulator.py
rename to sugar/oldsimulator.py
diff --git a/tests/simulator/bots/kiu.py b/tests/simulator/bots/kiu.py
index 17b1e1e9..2e8c448f 100755
--- a/tests/simulator/bots/kiu.py
+++ b/tests/simulator/bots/kiu.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
-from sugar.simulator import Bot
-from sugar.simulator import ShareActivityAction
+from sugar.oldsimulator import Bot
+from sugar.oldsimulator import ShareActivityAction
 from sugar.graphics.iconcolor import IconColor
 import os, random, gobject