diff --git a/Makefile b/Makefile
index 523b696..7b0ab7f 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ include $(PATH_MSXBUILD)/lib/make/msxbuild.mk
 $(call mb_make_call_eval,mb_doc_flow_help,MSXBUILD-Example)
 $(call mb_make_call_eval,mb_make_flow_0module,$(PATH_SRC))
 $(call mb_make_call_eval,mb_proj_flow_setup,$(PATH_BIN))
-$(call mb_make_call_eval,mb_proj_flow_flight_video,$(PATH_BIN))
+$(call mb_make_call_eval,mb_flight_proj_flow_video,$(PATH_BIN))
 
 
 # Add japanese support
diff --git a/lib/make/mb_flight.mk b/lib/make/mb_flight.mk
index 211837e..3739d3c 100644
--- a/lib/make/mb_flight.mk
+++ b/lib/make/mb_flight.mk
@@ -26,3 +26,42 @@ define mb_flight_video_merge
 endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_flight_video_merge,"Merged all flight videos to one.","<dir>")
 
+
+define mb_flight_proj_flow_video
+@@flight-video-build: @build
+	$$(if $$(filter on,$$(MB_FLIGHT_VIDEO)),$$(call mb_make_call,mb_flight_video_merge,$(1)))
+
+
+@flight-video-build: @clean
+	$$(call mb_make_call,_mb_proj_flow_step_before)
+	MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) -s @@flight-video-build
+	$$(call mb_make_call,_mb_proj_flow_step_done)
+MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@flight-video-build,"Runs @clean and @build with recorder and merges flight videos to one.")
+.PHONY: @flight-video-build
+
+
+@@flight-video-test: @test
+	$$(if $$(filter on,$$(MB_FLIGHT_VIDEO)),$$(call mb_make_call,mb_flight_video_merge,$(1)))
+
+
+@flight-video-test: @clean
+	$$(call mb_make_call,_mb_proj_flow_step_before)
+	MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) -s @@flight-video-test
+	$$(call mb_make_call,_mb_proj_flow_step_done)
+MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@flight-video-test,"Runs @clean and @test with recorder and merges flight videos to one.")
+.PHONY: @flight-video-test
+
+
+@@flight-video-package-qa: @package-qa
+	$$(if $$(filter on,$$(MB_FLIGHT_VIDEO)),$$(call mb_make_call,mb_flight_video_merge,$(1)))
+
+
+@flight-video-package-qa: @clean
+	$$(call mb_make_call,_mb_proj_flow_step_before)
+	MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) -s @@flight-video-package-qa
+	$$(call mb_make_call,_mb_proj_flow_step_done)
+MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@flight-video-package-qa,"Runs @clean and @package-qa with recorder and merges flight videos to one.")
+.PHONY: @flight-video-package-qa
+endef
+MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_flight_proj_flow_video,"Prints flow for adding flight video targets in project build cycle.","<path-bin>")
+
diff --git a/lib/make/mb_proj.mk b/lib/make/mb_proj.mk
index b93e43c..b0144be 100644
--- a/lib/make/mb_proj.mk
+++ b/lib/make/mb_proj.mk
@@ -248,30 +248,3 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@パッケージの
 endef
 MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_proj_flow_setup_jp,"Prints flow for japanese wrapper of project build cycle.")
 
-
-define mb_proj_flow_flight_video
-@@test-video: @test
-	$$(if $$(filter on,$$(MB_FLIGHT_VIDEO)),$$(call mb_make_call,mb_flight_video_merge,$(1)))
-
-
-@test-video: @clean
-	$$(call mb_make_call,_mb_proj_flow_step_before)
-	MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) @@test-video
-	$$(call mb_make_call,_mb_proj_flow_step_done)
-MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@test-video,"Runs @test with video recorder and merges flight videos to one.")
-.PHONY: @test-video
-
-
-@@package-qa-video: @package-qa
-	$$(if $$(filter on,$$(MB_FLIGHT_VIDEO)),$$(call mb_make_call,mb_flight_video_merge,$(1)))
-
-
-@package-qa-video: @clean
-	$$(call mb_make_call,_mb_proj_flow_step_before)
-	MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) -s @@package-qa-video
-	$$(call mb_make_call,_mb_proj_flow_step_done)
-MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@package-qa-video,"Runs @package-qa with video recorder and merges flight videos to one.")
-.PHONY: @test-video
-endef
-MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_proj_flow_flight_video,"Prints flow for adding video targets in project build cycle.","<path-bin>")
-