diff --git a/zulip_bots/zulip_bots/bots/gameoffifteen/__init__.py b/zulip_bots/zulip_bots/bots/game_of_fifteen/__init__.py
similarity index 100%
rename from zulip_bots/zulip_bots/bots/gameoffifteen/__init__.py
rename to zulip_bots/zulip_bots/bots/game_of_fifteen/__init__.py
diff --git a/zulip_bots/zulip_bots/bots/gameoffifteen/gameoffifteen.py b/zulip_bots/zulip_bots/bots/game_of_fifteen/game_of_fifteen.py
similarity index 100%
rename from zulip_bots/zulip_bots/bots/gameoffifteen/gameoffifteen.py
rename to zulip_bots/zulip_bots/bots/game_of_fifteen/game_of_fifteen.py
diff --git a/zulip_bots/zulip_bots/bots/gameoffifteen/requirements.txt b/zulip_bots/zulip_bots/bots/game_of_fifteen/requirements.txt
similarity index 100%
rename from zulip_bots/zulip_bots/bots/gameoffifteen/requirements.txt
rename to zulip_bots/zulip_bots/bots/game_of_fifteen/requirements.txt
diff --git a/zulip_bots/zulip_bots/bots/gameoffifteen/test_game_of_fifteen.py b/zulip_bots/zulip_bots/bots/game_of_fifteen/test_game_of_fifteen.py
similarity index 97%
rename from zulip_bots/zulip_bots/bots/gameoffifteen/test_game_of_fifteen.py
rename to zulip_bots/zulip_bots/bots/game_of_fifteen/test_game_of_fifteen.py
index 8c446e4..830b8d1 100644
--- a/zulip_bots/zulip_bots/bots/gameoffifteen/test_game_of_fifteen.py
+++ b/zulip_bots/zulip_bots/bots/game_of_fifteen/test_game_of_fifteen.py
@@ -2,13 +2,13 @@ from zulip_bots.test_lib import BotTestCase
 
 from contextlib import contextmanager
 from unittest.mock import MagicMock
-from zulip_bots.bots.gameoffifteen.gameoffifteen import *
+from zulip_bots.bots.game_of_fifteen.game_of_fifteen import GameOfFifteenModel
 from zulip_bots.game_handler import BadMoveException
-from typing import Dict, Any, List
+from typing import Dict, Any, List, Tuple
 
 
 class TestGameOfFifteenBot(BotTestCase):
-    bot_name = 'gameoffifteen'
+    bot_name = 'game_of_fifteen'
 
     def make_request_message(
         self,