diff --git a/src/test/scope/out2.log.match b/src/test/scope/out2.log.match
index 7e73311804487659e66353770df5204f241e5fe7..50225a08d30ab2622d10bd6786424aaea781969f 100644
--- a/src/test/scope/out2.log.match
+++ b/src/test/scope/out2.log.match
@@ -1,25 +1,25 @@
-pmem_check_version
-pmem_deep_drain
-pmem_deep_flush
-pmem_deep_persist
-pmem_drain
-pmem_errormsg
-$(OPT)pmem_fault_injection_enabled
-pmem_flush
-pmem_has_auto_flush
-pmem_has_hw_drain
-$(OPT)pmem_inject_fault_at
-pmem_is_pmem
-pmem_map_file
-pmem_memcpy
-pmem_memcpy_nodrain
-pmem_memcpy_persist
-pmem_memmove
-pmem_memmove_nodrain
-pmem_memmove_persist
-pmem_memset
-pmem_memset_nodrain
-pmem_memset_persist
-pmem_msync
-pmem_persist
-pmem_unmap
+pmem_check_version$(nW)
+pmem_deep_drain$(nW)
+pmem_deep_flush$(nW)
+pmem_deep_persist$(nW)
+pmem_drain$(nW)
+pmem_errormsg$(nW)
+$(OPT)pmem_fault_injection_enabled$(nW)
+pmem_flush$(nW)
+pmem_has_auto_flush$(nW)
+pmem_has_hw_drain$(nW)
+$(OPT)pmem_inject_fault_at$(nW)
+pmem_is_pmem$(nW)
+pmem_map_file$(nW)
+pmem_memcpy$(nW)
+pmem_memcpy_nodrain$(nW)
+pmem_memcpy_persist$(nW)
+pmem_memmove$(nW)
+pmem_memmove_nodrain$(nW)
+pmem_memmove_persist$(nW)
+pmem_memset$(nW)
+pmem_memset_nodrain$(nW)
+pmem_memset_persist$(nW)
+pmem_msync$(nW)
+pmem_persist$(nW)
+pmem_unmap$(nW)
diff --git a/src/test/scope/out3.log.match b/src/test/scope/out3.log.match
index 179ac11de944c8c71af3cdb65aa7be2e2a515470..74ce8a3297ff1bb77aedaaefdc10296b548d5540 100644
--- a/src/test/scope/out3.log.match
+++ b/src/test/scope/out3.log.match
@@ -1,18 +1,18 @@
-pmemlog_append
-pmemlog_appendv
-pmemlog_check
-pmemlog_check_version
-pmemlog_close
-pmemlog_create
-pmemlog_ctl_exec
-pmemlog_ctl_get
-pmemlog_ctl_set
-pmemlog_errormsg
-$(OPT)pmemlog_fault_injection_enabled
-$(OPT)pmemlog_inject_fault_at
-pmemlog_nbyte
-pmemlog_open
-pmemlog_rewind
-pmemlog_set_funcs
-pmemlog_tell
-pmemlog_walk
+pmemlog_append$(nW)
+pmemlog_appendv$(nW)
+pmemlog_check$(nW)
+pmemlog_check_version$(nW)
+pmemlog_close$(nW)
+pmemlog_create$(nW)
+pmemlog_ctl_exec$(nW)
+pmemlog_ctl_get$(nW)
+pmemlog_ctl_set$(nW)
+pmemlog_errormsg$(nW)
+$(OPT)pmemlog_fault_injection_enabled$(nW)
+$(OPT)pmemlog_inject_fault_at$(nW)
+pmemlog_nbyte$(nW)
+pmemlog_open$(nW)
+pmemlog_rewind$(nW)
+pmemlog_set_funcs$(nW)
+pmemlog_tell$(nW)
+pmemlog_walk$(nW)
diff --git a/src/test/scope/out4.log.match b/src/test/scope/out4.log.match
index a5ff56c557fc19c0a22abd09a0821eac1fce2789..3c3fc9bc3850159e284e8c96780c433ad7bfe5a2 100644
--- a/src/test/scope/out4.log.match
+++ b/src/test/scope/out4.log.match
@@ -1,18 +1,18 @@
-pmemblk_bsize
-pmemblk_check
-pmemblk_check_version
-pmemblk_close
-pmemblk_create
-pmemblk_ctl_exec
-pmemblk_ctl_get
-pmemblk_ctl_set
-pmemblk_errormsg
-$(OPT)pmemblk_fault_injection_enabled
-$(OPT)pmemblk_inject_fault_at
-pmemblk_nblock
-pmemblk_open
-pmemblk_read
-pmemblk_set_error
-pmemblk_set_funcs
-pmemblk_set_zero
-pmemblk_write
+pmemblk_bsize$(nW)
+pmemblk_check$(nW)
+pmemblk_check_version$(nW)
+pmemblk_close$(nW)
+pmemblk_create$(nW)
+pmemblk_ctl_exec$(nW)
+pmemblk_ctl_get$(nW)
+pmemblk_ctl_set$(nW)
+pmemblk_errormsg$(nW)
+$(OPT)pmemblk_fault_injection_enabled$(nW)
+$(OPT)pmemblk_inject_fault_at$(nW)
+pmemblk_nblock$(nW)
+pmemblk_open$(nW)
+pmemblk_read$(nW)
+pmemblk_set_error$(nW)
+pmemblk_set_funcs$(nW)
+pmemblk_set_zero$(nW)
+pmemblk_write$(nW)
diff --git a/src/test/scope/out6.log.match b/src/test/scope/out6.log.match
index 9778c0af53894e9fb77650aa19f4bc363e3e6390..4275c73ef10bccbf947bccd391737087bc10e1ef 100644
--- a/src/test/scope/out6.log.match
+++ b/src/test/scope/out6.log.match
@@ -1,13 +1,13 @@
-pmempool_check
-pmempool_check_end
-pmempool_check_init
-pmempool_check_version
-pmempool_errormsg
-$(OPT)pmempool_fault_injection_enabled
-pmempool_feature_disable
-pmempool_feature_enable
-pmempool_feature_query
-$(OPT)pmempool_inject_fault_at
-pmempool_rm
-pmempool_sync
-pmempool_transform
+pmempool_check$(nW)
+pmempool_check_end$(nW)
+pmempool_check_init$(nW)
+pmempool_check_version$(nW)
+pmempool_errormsg$(nW)
+$(OPT)pmempool_fault_injection_enabled$(nW)
+pmempool_feature_disable$(nW)
+pmempool_feature_enable$(nW)
+pmempool_feature_query$(nW)
+$(OPT)pmempool_inject_fault_at$(nW)
+pmempool_rm$(nW)
+pmempool_sync$(nW)
+pmempool_transform$(nW)