diff --git a/src/test/scope/out13.log.match b/src/test/scope/out13.log.match
index be6a11bd6d86ea24167ca2136d039dfb5344c33b..49a8b74a32368d57761a34a67a8561febf9f4f29 100644
--- a/src/test/scope/out13.log.match
+++ b/src/test/scope/out13.log.match
@@ -1,37 +1,37 @@
-pmem2_badblock_clear
-pmem2_badblock_context_delete
-pmem2_badblock_context_new
-pmem2_badblock_next
-pmem2_config_clear_address
-pmem2_config_delete
-pmem2_config_new
-pmem2_config_set_address
-pmem2_config_set_length
-pmem2_config_set_offset
-pmem2_config_set_protection
-pmem2_config_set_required_store_granularity
-pmem2_config_set_sharing
-pmem2_config_set_vm_reservation
-pmem2_deep_flush
-pmem2_errormsg
-pmem2_get_drain_fn
-pmem2_get_flush_fn
-pmem2_get_memcpy_fn
-pmem2_get_memmove_fn
-pmem2_get_memset_fn
-pmem2_get_persist_fn
-pmem2_map
-pmem2_map_get_address
-pmem2_map_get_size
-pmem2_map_get_store_granularity
-pmem2_perror
-pmem2_source_alignment
-pmem2_source_delete
-pmem2_source_device_id
-pmem2_source_device_usc
-pmem2_source_from_anon
-pmem2_source_from_fd
-pmem2_source_size
-pmem2_unmap
-pmem2_vm_reservation_delete
-pmem2_vm_reservation_new
+pmem2_badblock_clear$(nW)
+pmem2_badblock_context_delete$(nW)
+pmem2_badblock_context_new$(nW)
+pmem2_badblock_next$(nW)
+pmem2_config_clear_address$(nW)
+pmem2_config_delete$(nW)
+pmem2_config_new$(nW)
+pmem2_config_set_address$(nW)
+pmem2_config_set_length$(nW)
+pmem2_config_set_offset$(nW)
+pmem2_config_set_protection$(nW)
+pmem2_config_set_required_store_granularity$(nW)
+pmem2_config_set_sharing$(nW)
+pmem2_config_set_vm_reservation$(nW)
+pmem2_deep_flush$(nW)
+pmem2_errormsg$(nW)
+pmem2_get_drain_fn$(nW)
+pmem2_get_flush_fn$(nW)
+pmem2_get_memcpy_fn$(nW)
+pmem2_get_memmove_fn$(nW)
+pmem2_get_memset_fn$(nW)
+pmem2_get_persist_fn$(nW)
+pmem2_map$(nW)
+pmem2_map_get_address$(nW)
+pmem2_map_get_size$(nW)
+pmem2_map_get_store_granularity$(nW)
+pmem2_perror$(nW)
+pmem2_source_alignment$(nW)
+pmem2_source_delete$(nW)
+pmem2_source_device_id$(nW)
+pmem2_source_device_usc$(nW)
+pmem2_source_from_anon$(nW)
+pmem2_source_from_fd$(nW)
+pmem2_source_size$(nW)
+pmem2_unmap$(nW)
+pmem2_vm_reservation_delete$(nW)
+pmem2_vm_reservation_new$(nW)
diff --git a/src/test/scope/out5.log.match b/src/test/scope/out5.log.match
index 4506d9b4398db65f1785dbb31b49a546fad01c1a..3ad10d14459d18faeab5b96808c93cfa7260d427 100644
--- a/src/test/scope/out5.log.match
+++ b/src/test/scope/out5.log.match
@@ -1,111 +1,111 @@
-_pobj_cache_invalidate
-_pobj_cached_pool
-_pobj_debug_notice
-pmemobj_alloc
-pmemobj_alloc_usable_size
-pmemobj_cancel
-pmemobj_check
-pmemobj_check_version
-pmemobj_close
-pmemobj_cond_broadcast
-pmemobj_cond_signal
-pmemobj_cond_timedwait
-pmemobj_cond_wait
-pmemobj_cond_zero
-pmemobj_create
-pmemobj_ctl_exec
-pmemobj_ctl_get
-pmemobj_ctl_set
-pmemobj_defer_free
-pmemobj_defrag
-pmemobj_direct
-pmemobj_drain
-pmemobj_errormsg
-$(OPT)pmemobj_fault_injection_enabled
-pmemobj_first
-pmemobj_flush
-pmemobj_free
-pmemobj_get_user_data
-$(OPT)pmemobj_inject_fault_at
-pmemobj_list_insert
-pmemobj_list_insert_new
-pmemobj_list_move
-pmemobj_list_remove
-pmemobj_memcpy
-pmemobj_memcpy_persist
-pmemobj_memmove
-pmemobj_memset
-pmemobj_memset_persist
-pmemobj_mutex_lock
-pmemobj_mutex_timedlock
-pmemobj_mutex_trylock
-pmemobj_mutex_unlock
-pmemobj_mutex_zero
-pmemobj_next
-pmemobj_oid
-pmemobj_open
-pmemobj_persist
-pmemobj_pool_by_oid
-pmemobj_pool_by_ptr
-pmemobj_publish
-pmemobj_realloc
-pmemobj_reserve
-pmemobj_root
-pmemobj_root_construct
-pmemobj_root_size
-pmemobj_rwlock_rdlock
-pmemobj_rwlock_timedrdlock
-pmemobj_rwlock_timedwrlock
-pmemobj_rwlock_tryrdlock
-pmemobj_rwlock_trywrlock
-pmemobj_rwlock_unlock
-pmemobj_rwlock_wrlock
-pmemobj_rwlock_zero
-pmemobj_set_funcs
-pmemobj_set_user_data
-pmemobj_set_value
-pmemobj_strdup
-pmemobj_tx_abort
-pmemobj_tx_add_range
-pmemobj_tx_add_range_direct
-pmemobj_tx_alloc
-pmemobj_tx_begin
-pmemobj_tx_commit
-pmemobj_tx_end
-pmemobj_tx_errno
-pmemobj_tx_free
-pmemobj_tx_get_failure_behavior
-pmemobj_tx_get_user_data
-pmemobj_tx_lock
-pmemobj_tx_log_append_buffer
-pmemobj_tx_log_auto_alloc
-pmemobj_tx_log_intents_max_size
-pmemobj_tx_log_snapshots_max_size
-pmemobj_tx_process
-pmemobj_tx_publish
-pmemobj_tx_realloc
-pmemobj_tx_set_failure_behavior
-pmemobj_tx_set_user_data
-pmemobj_tx_stage
-pmemobj_tx_strdup
-pmemobj_tx_wcsdup
-pmemobj_tx_xadd_range
-pmemobj_tx_xadd_range_direct
-pmemobj_tx_xalloc
-pmemobj_tx_xfree
-pmemobj_tx_xlock
-pmemobj_tx_xlog_append_buffer
-pmemobj_tx_xpublish
-pmemobj_tx_xstrdup
-pmemobj_tx_xwcsdup
-pmemobj_tx_zalloc
-pmemobj_tx_zrealloc
-pmemobj_type_num
-pmemobj_volatile
-pmemobj_wcsdup
-pmemobj_xalloc
-pmemobj_xflush
-pmemobj_xpersist
-pmemobj_xreserve
-pmemobj_zalloc
-pmemobj_zrealloc
+_pobj_cache_invalidate$(nW)
+_pobj_cached_pool$(nW)
+_pobj_debug_notice$(nW)
+pmemobj_alloc$(nW)
+pmemobj_alloc_usable_size$(nW)
+pmemobj_cancel$(nW)
+pmemobj_check$(nW)
+pmemobj_check_version$(nW)
+pmemobj_close$(nW)
+pmemobj_cond_broadcast$(nW)
+pmemobj_cond_signal$(nW)
+pmemobj_cond_timedwait$(nW)
+pmemobj_cond_wait$(nW)
+pmemobj_cond_zero$(nW)
+pmemobj_create$(nW)
+pmemobj_ctl_exec$(nW)
+pmemobj_ctl_get$(nW)
+pmemobj_ctl_set$(nW)
+pmemobj_defer_free$(nW)
+pmemobj_defrag$(nW)
+pmemobj_direct$(nW)
+pmemobj_drain$(nW)
+pmemobj_errormsg$(nW)
+$(OPT)pmemobj_fault_injection_enabled$(nW)
+pmemobj_first$(nW)
+pmemobj_flush$(nW)
+pmemobj_free$(nW)
+pmemobj_get_user_data$(nW)
+$(OPT)pmemobj_inject_fault_at$(nW)
+pmemobj_list_insert$(nW)
+pmemobj_list_insert_new$(nW)
+pmemobj_list_move$(nW)
+pmemobj_list_remove$(nW)
+pmemobj_memcpy$(nW)
+pmemobj_memcpy_persist$(nW)
+pmemobj_memmove$(nW)
+pmemobj_memset$(nW)
+pmemobj_memset_persist$(nW)
+pmemobj_mutex_lock$(nW)
+pmemobj_mutex_timedlock$(nW)
+pmemobj_mutex_trylock$(nW)
+pmemobj_mutex_unlock$(nW)
+pmemobj_mutex_zero$(nW)
+pmemobj_next$(nW)
+pmemobj_oid$(nW)
+pmemobj_open$(nW)
+pmemobj_persist$(nW)
+pmemobj_pool_by_oid$(nW)
+pmemobj_pool_by_ptr$(nW)
+pmemobj_publish$(nW)
+pmemobj_realloc$(nW)
+pmemobj_reserve$(nW)
+pmemobj_root$(nW)
+pmemobj_root_construct$(nW)
+pmemobj_root_size$(nW)
+pmemobj_rwlock_rdlock$(nW)
+pmemobj_rwlock_timedrdlock$(nW)
+pmemobj_rwlock_timedwrlock$(nW)
+pmemobj_rwlock_tryrdlock$(nW)
+pmemobj_rwlock_trywrlock$(nW)
+pmemobj_rwlock_unlock$(nW)
+pmemobj_rwlock_wrlock$(nW)
+pmemobj_rwlock_zero$(nW)
+pmemobj_set_funcs$(nW)
+pmemobj_set_user_data$(nW)
+pmemobj_set_value$(nW)
+pmemobj_strdup$(nW)
+pmemobj_tx_abort$(nW)
+pmemobj_tx_add_range$(nW)
+pmemobj_tx_add_range_direct$(nW)
+pmemobj_tx_alloc$(nW)
+pmemobj_tx_begin$(nW)
+pmemobj_tx_commit$(nW)
+pmemobj_tx_end$(nW)
+pmemobj_tx_errno$(nW)
+pmemobj_tx_free$(nW)
+pmemobj_tx_get_failure_behavior$(nW)
+pmemobj_tx_get_user_data$(nW)
+pmemobj_tx_lock$(nW)
+pmemobj_tx_log_append_buffer$(nW)
+pmemobj_tx_log_auto_alloc$(nW)
+pmemobj_tx_log_intents_max_size$(nW)
+pmemobj_tx_log_snapshots_max_size$(nW)
+pmemobj_tx_process$(nW)
+pmemobj_tx_publish$(nW)
+pmemobj_tx_realloc$(nW)
+pmemobj_tx_set_failure_behavior$(nW)
+pmemobj_tx_set_user_data$(nW)
+pmemobj_tx_stage$(nW)
+pmemobj_tx_strdup$(nW)
+pmemobj_tx_wcsdup$(nW)
+pmemobj_tx_xadd_range$(nW)
+pmemobj_tx_xadd_range_direct$(nW)
+pmemobj_tx_xalloc$(nW)
+pmemobj_tx_xfree$(nW)
+pmemobj_tx_xlock$(nW)
+pmemobj_tx_xlog_append_buffer$(nW)
+pmemobj_tx_xpublish$(nW)
+pmemobj_tx_xstrdup$(nW)
+pmemobj_tx_xwcsdup$(nW)
+pmemobj_tx_zalloc$(nW)
+pmemobj_tx_zrealloc$(nW)
+pmemobj_type_num$(nW)
+pmemobj_volatile$(nW)
+pmemobj_wcsdup$(nW)
+pmemobj_xalloc$(nW)
+pmemobj_xflush$(nW)
+pmemobj_xpersist$(nW)
+pmemobj_xreserve$(nW)
+pmemobj_zalloc$(nW)
+pmemobj_zrealloc$(nW)