diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
index de3b519..7018c8a 100644
--- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
+++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
@@ -1,25 +1,28 @@
 
-define __mb_assert_flow_grep_binary
+define __mb_flow_assert_grep_binary_x
 .RECIPEPREFIX := $(MB_@RECIPE)
-$(1)/@assert-$(2): $(1)/@build
+$(1)/$(5)-$(2): $(1)/@build
 $(MB_@RECIPE)grep -q -U $(4) $(1)/$(3)
-$(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_assert,$$(MB_I18N_ASSERT_SUCCESS) @assert-$(2))
-$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.")
-$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@assert-$(2))
-$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)/@assert-$(2))
+$(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_assert,$$(MB_I18N_ASSERT_SUCCESS) v-$(2))
+$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_doc_target,$(1)/$(5)-$(2),"Asserts that $(3) output matches.")
+$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/$(5)-$(2))
+$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)/$(5)-$(2))
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
 endef
-
-define mb_assert_flow_grep_binary
-$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,mb_assert_flow_grep_binary,$(1),$(2),$(3),$(4))
-$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_assert_flow_grep_binary,$(1),$(2),$(3),$(4)))
+define mb_flow_assert_grep_binary_test
+$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,$(0),$(1),$(2),$(3),$(4))
+$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_flow_assert_grep_binary_x,$(1),$(2),$(3),$(4),@test))
 endef
-$(call mb_make_call,mb_doc_function_flow,mb_assert_flow_grep_binary,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>")
+$(call mb_make_call,mb_doc_function_flow,mb_flow_assert_grep_binary_test,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>")
+define mb_flow_assert_grep_binary_package_qa
+$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,$(0),$(1),$(2),$(3),$(4))
+$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_flow_assert_grep_binary_x,$(1),$(2),$(3),$(4),@package-qa))
+endef
+$(call mb_make_call,mb_doc_function_flow,mb_flow_assert_grep_binary_package_qa,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>")
 
 #$$(call mb_delete,$(1)/$(3).out)
 define __mb_assert_flow_bdos_grep
 .RECIPEPREFIX := $(MB_@RECIPE)
-MB__TARGET := $(1)-test-$(2)/@assert
 $(1)-test-$(2)/@assert: $(1)/@build
 $(MB_@RECIPE)$$(call mb_make_call,mb_os_dir_create,$(1)-test-$(2))
 $(MB_@RECIPE)$$(call mb_make_call,mb_os_file_copy,$(1)/$(3).com,$(1)-test-$(2))
@@ -32,6 +35,7 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)-
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
 endef
 
+#$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE))
 define mb_assert_flow_bdos_grep
 $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4))
 $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4),$(5)))
diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
index 241b0da..aa70968 100644
--- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
+++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
@@ -1,5 +1,5 @@
 
-define __mb_tool_clone_flow_deps
+define __mb_flow_clone_deps
 .RECIPEPREFIX := $(MB_@RECIPE)
 
 $(1)/@clean: @@clean
@@ -33,9 +33,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
 
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
 endef
-define mb_tool_clone_flow_deps
-$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,mb_tool_clone_flow_deps,$(1),$(2),$(3))
-$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_tool_clone_flow_deps,$(1),$(2),$(3),$(call mb_make_call,mb_proj_module_local_deps,$(1),$(3)),$(4),$(5)))
+define mb_flow_clone_deps
+$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
+$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3),$(call mb_make_call,mb_proj_module_local_deps,$(1),$(3)),$(4),$(5)))
 endef
-$(call mb_make_call,mb_doc_function_flow,mb_tool_clone_flow_deps,"Inject flow of file copy toolchain module.","<bin-to> <bin-from> <deps> [machine] [os-version]")
+$(call mb_make_call,mb_doc_function_flow,mb_flow_clone_deps,"Inject flow of file copy toolchain module.","<bin-to> <bin-from> <deps> [machine] [os-version]")
 
diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
index 40453d4..0392916 100644
--- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
+++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
@@ -1,5 +1,5 @@
 
-define __mb_tool_m80_flow_bdos_mono
+define __mb_flow_m80_bdos_mono
 .RECIPEPREFIX := $(MB_@RECIPE)
 
 $(1): | @init
@@ -41,9 +41,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
 
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
 endef
-define mb_tool_m80_flow_bdos_mono
+define mb_flow_m80_bdos_mono
 $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
 $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3)))
 endef
-$(call mb_make_call,mb_doc_function_flow,mb_tool_m80_flow_bdos_mono,"Inject flow of m80 toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")
+$(call mb_make_call,mb_doc_function_flow,mb_flow_m80_bdos_mono,"Inject flow of m80 toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")
 
diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
index af2d7ad..b0ffa3c 100644
--- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
+++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
@@ -1,5 +1,5 @@
 
-define __mb_tool_sdcc_flow_bdos_mono
+define __mb_flow_sdcc_bdos_mono
 .RECIPEPREFIX := $(MB_@RECIPE)
 
 $(1): | @init
@@ -33,9 +33,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
 
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
 endef
-define mb_tool_sdcc_flow_bdos_mono
+define mb_flow_sdcc_bdos_mono
 $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
 $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3)))
 endef
-$(call mb_make_call,mb_doc_function_flow,mb_tool_sdcc_flow_bdos_mono,"Inject flow of sdcc toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")
+$(call mb_make_call,mb_doc_function_flow,mb_flow_sdcc_bdos_mono,"Inject flow of sdcc toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")
 
diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk
index b1fd34b..ab582b7 100644
--- a/src/ahello-m80/0module.mk
+++ b/src/ahello-m80/0module.mk
@@ -3,7 +3,7 @@ AHELLO_M80_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
 AHELLO_M80_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
 
 
-$(call mb_make_call,mb_tool_m80_flow_bdos_mono,$(AHELLO_M80_BIN),$(AHELLO_M80_SRC),ahello)
+$(call mb_make_call,mb_flow_m80_bdos_mono,$(AHELLO_M80_BIN),$(AHELLO_M80_SRC),ahello)
 $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-m80,ahello,M80)
 $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-txt,ahello,"o world...")
 
diff --git a/src/ahello-sdcc/0module.mk b/src/ahello-sdcc/0module.mk
index c8c5d83..5fa8ed5 100644
--- a/src/ahello-sdcc/0module.mk
+++ b/src/ahello-sdcc/0module.mk
@@ -3,7 +3,7 @@ AHELLO_SDCC_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
 AHELLO_SDCC_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
 
 
-$(call mb_make_call,mb_tool_sdcc_flow_bdos_mono,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_SRC),ahello)
+$(call mb_make_call,mb_flow_sdcc_bdos_mono,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_SRC),ahello)
 $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-sdcc,ahello,SDCC)
 $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-hell,ahello,Hell)
 
diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk
index 880d553..83486d4 100644
--- a/src/dist-qa-dos1/0module.mk
+++ b/src/dist-qa-dos1/0module.mk
@@ -3,7 +3,7 @@ DIST_QA_DOS1_SRC     := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
 DIST_QA_DOS1_BIN     := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
 
 
-$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_DOS1_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos1)
+$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS1_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos1)
 
 
 $(DIST_QA_DOS1_BIN)/@assert: $(DIST_QA_DOS1_BIN)/@build
diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk
index 89ae37c..01320f9 100644
--- a/src/dist-qa-dos2/0module.mk
+++ b/src/dist-qa-dos2/0module.mk
@@ -3,7 +3,7 @@ DIST_QA_DOS2_SRC     := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
 DIST_QA_DOS2_BIN     := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
 
 
-$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_DOS2_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos2)
+$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS2_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos2)
 
 
 $(DIST_QA_DOS2_BIN)/@assert: $(DIST_QA_DOS2_BIN)/@build
diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk
index b0d66a7..f2efadd 100644
--- a/src/dist-qa-msx1/0module.mk
+++ b/src/dist-qa-msx1/0module.mk
@@ -7,7 +7,7 @@ DIST_QA_MSX1_MACHINE ?= Canon_V-20
 $(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE,"The machine to run the msx1 qa module on.")
 
 
-$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE))
+$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE))
 
 $(DIST_QA_MSX1_BIN)/@assert: $(DIST_QA_MSX1_BIN)/@build
 _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out)
diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk
index 0228dcf..ab604d0 100644
--- a/src/make-on-msx/0module.mk
+++ b/src/make-on-msx/0module.mk
@@ -47,10 +47,5 @@ _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN))
 $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.")
 $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)/@run)
 
-$(call mb_make_call,mb_assert_flow_grep_binary,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot)
-#$(MAKE_ON_MSX_BIN)/@assert-check-bin: $(MAKE_ON_MSX_BIN)/@build
-#	grep -U "screenshot" $(MAKE_ON_MSX_BIN)/nfbsshot.bin
-#MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@assert-check-bin,"Asserts that binary contains screenshot string.")
-#MB_PROJ_PHASE_TEST_DEPS += $(MAKE_ON_MSX_BIN)/@assert-check-bin
-#$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)/@assert-check-bin)
+$(call mb_make_call,mb_flow_assert_grep_binary_test,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot)
 
diff --git a/src/mbboot80/0module.mk b/src/mbboot80/0module.mk
index 74d0fe2..16e8eb9 100644
--- a/src/mbboot80/0module.mk
+++ b/src/mbboot80/0module.mk
@@ -3,7 +3,7 @@ MBBOOT80_SRC  := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
 MBBOOT80_BIN  := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
 
 
-$(call mb_make_call,mb_tool_sdcc_flow_bdos_mono,$(MBBOOT80_BIN),$(MBBOOT80_SRC),mbboot80)
+$(call mb_make_call,mb_flow_sdcc_bdos_mono,$(MBBOOT80_BIN),$(MBBOOT80_SRC),mbboot80)
 $(call mb_make_call,mb_assert_flow_bdos_grep,$(MBBOOT80_BIN),check-boot80,mbboot80,"mb::boot mode 80")