diff --git a/Tools/Replay/Makefile b/Tools/Replay/Makefile
index 6e91e73872..07c3275e70 100644
--- a/Tools/Replay/Makefile
+++ b/Tools/Replay/Makefile
@@ -2,8 +2,8 @@
 
 all:
 	@cd ../../ && modules/waf/waf-light configure --board sitl --debug --disable-scripting
-	@cd ../../ && modules/waf/waf-light --target tools/Replay
-	@cp ../../build/sitl/tools/Replay Replay.elf
+	@cd ../../ && modules/waf/waf-light --target tool/Replay
+	@cp ../../build/sitl/tool/Replay Replay.elf
 	@echo Built Replay.elf
 
 clean:
diff --git a/Tools/Replay/check_replay_branch.py b/Tools/Replay/check_replay_branch.py
index ee233207b3..187889f9bc 100755
--- a/Tools/Replay/check_replay_branch.py
+++ b/Tools/Replay/check_replay_branch.py
@@ -95,7 +95,7 @@ class CheckReplayBranch(object):
         subprocess.check_call(["./waf", "replay"])
 
     def run_replay_on_log(self, logfile_path):
-        subprocess.check_call(["./build/sitl/tools/Replay", logfile_path])
+        subprocess.check_call(["./build/sitl/tool/Replay", logfile_path])
 
     def get_logs(self):
         return sorted(glob.glob("logs/*.BIN"))
diff --git a/Tools/Replay/wscript b/Tools/Replay/wscript
index c468092d76..cdcaf99864 100644
--- a/Tools/Replay/wscript
+++ b/Tools/Replay/wscript
@@ -23,6 +23,6 @@ def build(bld):
     )
 
     bld.ap_program(
-        program_groups=['tools','replay'],
+        program_groups=['tool','replay'],
         use=vehicle + '_libs',
     )