.......... [DEV-2142] update from branch 'master' of ssh://git.zabbix.com:7999/zbx/zabbix into feature/DEV-2142-6.3-3

40 files changed, 228 insertions, 220 deletions

diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am
index f602291c2f4..720ce4f31ff 100644
--- a/tests/libs/zbxsysinfo/Makefile.am
+++ b/tests/libs/zbxsysinfo/Makefile.am
@@ -191,19 +191,19 @@ zbx_execute_agent_check_LDADD = $(COMMON_LIB_FILES) \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a
 
 zbx_execute_agent_check_WRAP_FUNCS = \
-	-Wl,--wrap=SYSTEM_LOCALTIME \
-	-Wl,--wrap=VFS_FILE_SIZE \
-	-Wl,--wrap=VFS_FILE_TIME \
-	-Wl,--wrap=VFS_FILE_EXISTS \
-	-Wl,--wrap=VFS_FILE_CONTENTS \
-	-Wl,--wrap=VFS_FILE_REGMATCH \
-	-Wl,--wrap=VFS_FILE_MD5SUM \
-	-Wl,--wrap=VFS_FILE_CKSUM \
-	-Wl,--wrap=VFS_DIR_SIZE \
-	-Wl,--wrap=NET_DNS \
-	-Wl,--wrap=NET_DNS_RECORD \
-	-Wl,--wrap=NET_TCP_PORT \
-	-Wl,--wrap=SYSTEM_USERS_NUM
+	-Wl,--wrap=system_localtime \
+	-Wl,--wrap=vfs_file_size \
+	-Wl,--wrap=vfs_file_time \
+	-Wl,--wrap=vfs_file_exists \
+	-Wl,--wrap=vfs_file_contents \
+	-Wl,--wrap=vfs_file_regmatch \
+	-Wl,--wrap=vfs_file_md5sum \
+	-Wl,--wrap=vfs_file_cksum \
+	-Wl,--wrap=vfs_dir_size \
+	-Wl,--wrap=net_dns \
+	-Wl,--wrap=net_dns_record \
+	-Wl,--wrap=net_tcp_port \
+	-Wl,--wrap=system_users_num
 
 zbx_execute_agent_check_LDADD += @AGENT_LIBS@
 
@@ -220,9 +220,9 @@ zbx_execute_agent_check_http_SOURCES = \
 zbx_execute_agent_check_http_LDADD = $(COMMON_LIB_FILES)
 
 zbx_execute_agent_check_http_WRAP_FUNCS = \
-	-Wl,--wrap=WEB_PAGE_GET \
-	-Wl,--wrap=WEB_PAGE_PERF \
-	-Wl,--wrap=WEB_PAGE_REGEXP
+	-Wl,--wrap=web_page_get \
+	-Wl,--wrap=web_page_perf \
+	-Wl,--wrap=web_page_regexp
 
 zbx_execute_agent_check_http_LDADD += @AGENT_LIBS@
 
diff --git a/tests/libs/zbxsysinfo/check_service_test.c b/tests/libs/zbxsysinfo/check_service_test.c
index 2b46b122baa..36e4a82e458 100644
--- a/tests/libs/zbxsysinfo/check_service_test.c
+++ b/tests/libs/zbxsysinfo/check_service_test.c
@@ -23,6 +23,7 @@
 
 #include "../../../src/libs/zbxsysinfo/simple/simple.h"
 #include "../../../include/zbxsysinfo.h"
+#include "../../../src/libs/zbxsysinfo/sysinfo.h"
 
 int	__wrap_tcp_expect(const char *host, unsigned short port, int timeout, const char *request,
 		int (*validate_func)(const char *), const char *sendtoclose, int *value_int)
@@ -66,7 +67,7 @@ void	zbx_mock_test_entry(void **state)
 	strcat(key, "]");
 	zbx_parse_item_key(key, &request);
 
-	returned_code = check_service(&request, default_addr, &result, 0);
+	returned_code = zbx_check_service_default_addr(&request, default_addr, &result, 0);
 	if (SUCCEED != returned_code && NULL != result.msg && '\0' != *(result.msg))
 		printf("check_service_test error: %s\n", result.msg);
 
diff --git a/tests/libs/zbxsysinfo/common/Makefile.am b/tests/libs/zbxsysinfo/common/Makefile.am
index c423a741646..b2b2eb589c2 100644
--- a/tests/libs/zbxsysinfo/common/Makefile.am
+++ b/tests/libs/zbxsysinfo/common/Makefile.am
@@ -1,8 +1,8 @@
 if AGENT
 AGENT_tests = \
-	SYSTEM_LOCALTIME \
-	WEB_PAGE_GET \
-	VFS_FILE_EXISTS
+	system_localtime \
+	web_page_get \
+	vfs_file_exists
 endif
 
 noinst_PROGRAMS = $(AGENT_tests)
@@ -57,61 +57,61 @@ COMMON_LIB_FILES = \
 
 COMMON_COMPILER_FLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests
 
-SYSTEM_LOCALTIME_SOURCES = \
-	SYSTEM_LOCALTIME.c \
+system_localtime_SOURCES = \
+	system_localtime.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_LOCALTIME_WRAP_FUNCS = \
+system_localtime_WRAP_FUNCS = \
 	-Wl,--wrap=time \
 	-Wl,--wrap=gettimeofday
 
-SYSTEM_LOCALTIME_LDADD = \
+system_localtime_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_LOCALTIME_LDADD += @AGENT_LIBS@
+system_localtime_LDADD += @AGENT_LIBS@
 
-SYSTEM_LOCALTIME_LDFLAGS = @AGENT_LDFLAGS@ $(SYSTEM_LOCALTIME_WRAP_FUNCS)
+system_localtime_LDFLAGS = @AGENT_LDFLAGS@ $(system_localtime_WRAP_FUNCS)
 
-SYSTEM_LOCALTIME_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_localtime_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-WEB_PAGE_GET_SOURCES = \
-	WEB_PAGE_GET.c \
+web_page_get_SOURCES = \
+	web_page_get.c \
 	$(COMMON_SRC_FILES)
 
 if HAVE_LIBCURL
-WEB_PAGE_GET_WRAP_FUNCS = \
+web_page_get_WRAP_FUNCS = \
 	-Wl,--wrap=curl_easy_init \
 	-Wl,--wrap=curl_easy_setopt \
 	-Wl,--wrap=curl_easy_perform \
 	-Wl,--wrap=curl_easy_cleanup
 else
-WEB_PAGE_GET_WRAP_FUNCS = \
+web_page_get_WRAP_FUNCS = \
 	-Wl,--wrap=zbx_tcp_connect \
 	-Wl,--wrap=zbx_tcp_send_ext \
 	-Wl,--wrap=zbx_tcp_recv_raw_ext \
 	-Wl,--wrap=zbx_tcp_close
 endif
 
-WEB_PAGE_GET_LDADD = \
+web_page_get_LDADD = \
 	$(COMMON_LIB_FILES)
 
-WEB_PAGE_GET_LDADD += @AGENT_LIBS@
+web_page_get_LDADD += @AGENT_LIBS@
 
-WEB_PAGE_GET_LDFLAGS = @AGENT_LDFLAGS@ $(WEB_PAGE_GET_WRAP_FUNCS)
+web_page_get_LDFLAGS = @AGENT_LDFLAGS@ $(web_page_get_WRAP_FUNCS)
 
-WEB_PAGE_GET_CFLAGS = $(COMMON_COMPILER_FLAGS)
+web_page_get_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-VFS_FILE_EXISTS_SOURCES = \
-	VFS_FILE_EXISTS.c \
+vfs_file_exists_SOURCES = \
+	vfs_file_exists.c \
 	$(COMMON_SRC_FILES)
 
-VFS_FILE_EXISTS_LDADD = \
+vfs_file_exists_LDADD = \
 	$(COMMON_LIB_FILES)
 
-VFS_FILE_EXISTS_LDADD += @AGENT_LIBS@
+vfs_file_exists_LDADD += @AGENT_LIBS@
 
-VFS_FILE_EXISTS = @AGENT_LDFLAGS@
+vfs_file_exists = @AGENT_LDFLAGS@
 
-VFS_FILE_EXISTS_CFLAGS = $(COMMON_COMPILER_FLAGS) -I$(top_srcdir)/src/libs/zbxsysinfo/common/
+vfs_file_exists_CFLAGS = $(COMMON_COMPILER_FLAGS) -I$(top_srcdir)/src/libs/zbxsysinfo/common/
 
 endif
diff --git a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c b/tests/libs/zbxsysinfo/common/system_localtime.c
index e6c6aa5729f..02cc44412c6 100644
--- a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.c
+++ b/tests/libs/zbxsysinfo/common/system_localtime.c
@@ -21,6 +21,7 @@
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "zbxnum.h"
 #include "../../../../src/libs/zbxsysinfo/common/system.h"
 
@@ -149,7 +150,7 @@ void	zbx_mock_test_entry(void **state)
 	if (0 != strcmp(request.key, "system.localtime"))
 		fail_msg("Got unexpected item key parameter from test case data: %s", key_string);
 
-	if (expected_result != (actual_result = SYSTEM_LOCALTIME(&request, &param_result)))
+	if (expected_result != (actual_result = system_localtime(&request, &param_result)))
 	{
 		fail_msg("Got '%s' instead of '%s' as a result.", zbx_sysinfo_ret_string(actual_result),
 				zbx_sysinfo_ret_string(expected_result));
diff --git a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.yaml b/tests/libs/zbxsysinfo/common/system_localtime.yaml
index 6ff25863840..6ff25863840 100644
--- a/tests/libs/zbxsysinfo/common/SYSTEM_LOCALTIME.yaml
+++ b/tests/libs/zbxsysinfo/common/system_localtime.yaml
diff --git a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c b/tests/libs/zbxsysinfo/common/vfs_file_exists.c
index ecb26349892..9335ba46775 100644
--- a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.c
+++ b/tests/libs/zbxsysinfo/common/vfs_file_exists.c
@@ -23,6 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "file.h"
 
 #define TEST_NAME "VFS_FILE_EXISTS"
@@ -45,7 +46,7 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key(key, &request))
 		fail_msg("Cannot parse item key: %s", key);
 
-	ret = VFS_FILE_EXISTS(&request, &result);
+	ret = vfs_file_exists(&request, &result);
 	zbx_mock_assert_sysinfo_ret_eq("Invalid "TEST_NAME" return value", expected_ret, ret);
 
 	if (SYSINFO_RET_OK == ret)
diff --git a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.yaml b/tests/libs/zbxsysinfo/common/vfs_file_exists.yaml
index 47df00417fb..47df00417fb 100644
--- a/tests/libs/zbxsysinfo/common/VFS_FILE_EXISTS.yaml
+++ b/tests/libs/zbxsysinfo/common/vfs_file_exists.yaml
diff --git a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c b/tests/libs/zbxsysinfo/common/web_page_get.c
index 981f1d6efa9..22811829dbd 100644
--- a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c
+++ b/tests/libs/zbxsysinfo/common/web_page_get.c
@@ -23,6 +23,7 @@
 
 #include "zbxcomms.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "../../../../src/libs/zbxsysinfo/common/http.h"
 
 #ifndef HAVE_LIBCURL
@@ -80,7 +81,7 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key(init_param, &request))
 		fail_msg("Cannot parse item key: %s", init_param);
 
-	if (expected_result != (actual_result = WEB_PAGE_GET(&request, &param_result)))
+	if (expected_result != (actual_result = web_page_get(&request, &param_result)))
 	{
 		fail_msg("Got %s instead of %s as a result.", zbx_sysinfo_ret_string(actual_result),
 			zbx_sysinfo_ret_string(expected_result));
diff --git a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.yaml b/tests/libs/zbxsysinfo/common/web_page_get.yaml
index 82be2c9ff5b..82be2c9ff5b 100644
--- a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.yaml
+++ b/tests/libs/zbxsysinfo/common/web_page_get.yaml
diff --git a/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am
index a6ab079258a..4733cf0140e 100644
--- a/tests/libs/zbxsysinfo/linux/Makefile.am
+++ b/tests/libs/zbxsysinfo/linux/Makefile.am
@@ -1,16 +1,16 @@
 if AGENT
 AGENT_tests = \
-	NET_IF_DISCOVERY \
-	VFS_FS_DISCOVERY \
-	KERNEL_MAXPROC \
-	SYSTEM_CPU_SWITCHES \
-	KERNEL_MAXFILES \
-	SYSTEM_CPU_INTR \
-	SYSTEM_BOOTTIME \
-	NET_IF_TOTAL \
-	NET_IF_IN \
-	NET_IF_OUT \
-	SYSTEM_HW_CHASSIS
+	net_if_discovery \
+	vfs_fs_discovery \
+	kernel_maxproc \
+	system_cpu_switches \
+	kernel_maxfiles \
+	system_cpu_intr \
+	system_boottime \
+	net_if_total \
+	net_if_in \
+	net_if_out \
+	system_hw_chassis
 endif
 
 noinst_PROGRAMS = $(AGENT_tests)
@@ -65,136 +65,136 @@ COMMON_LIB_FILES = \
 
 COMMON_COMPILER_FLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests
 
-NET_IF_DISCOVERY_SOURCES = \
-	NET_IF_DISCOVERY.c \
+net_if_discovery_SOURCES = \
+	net_if_discovery.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_DISCOVERY_LDADD = \
+net_if_discovery_LDADD = \
 	$(COMMON_LIB_FILES)
 
-NET_IF_DISCOVERY_LDADD += @AGENT_LIBS@
+net_if_discovery_LDADD += @AGENT_LIBS@
 
-NET_IF_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@
+net_if_discovery_LDFLAGS = @AGENT_LDFLAGS@
 
-NET_IF_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_discovery_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-VFS_FS_DISCOVERY_SOURCES = \
-	VFS_FS_DISCOVERY.c \
+vfs_fs_discovery_SOURCES = \
+	vfs_fs_discovery.c \
 	$(COMMON_SRC_FILES)
 
-VFS_FS_DISCOVERY_LDADD = \
+vfs_fs_discovery_LDADD = \
 	$(COMMON_LIB_FILES)
 
-VFS_FS_DISCOVERY_LDADD += @AGENT_LIBS@
+vfs_fs_discovery_LDADD += @AGENT_LIBS@
 
-VFS_FS_DISCOVERY_LDFLAGS = @AGENT_LDFLAGS@
+vfs_fs_discovery_LDFLAGS = @AGENT_LDFLAGS@
 
-VFS_FS_DISCOVERY_CFLAGS = $(COMMON_COMPILER_FLAGS)
+vfs_fs_discovery_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-KERNEL_MAXPROC_SOURCES = \
-	KERNEL_COMMON.c \
-	KERNEL_MAXPROC.c \
+kernel_maxproc_SOURCES = \
+	kernel_common.c \
+	kernel_maxproc.c \
 	$(COMMON_SRC_FILES)
 
-KERNEL_MAXPROC_LDADD = \
+kernel_maxproc_LDADD = \
 	$(COMMON_LIB_FILES)
 
-KERNEL_MAXPROC_LDADD += @AGENT_LIBS@
+kernel_maxproc_LDADD += @AGENT_LIBS@
 
-KERNEL_MAXPROC_LDFLAGS = @AGENT_LDFLAGS@
+kernel_maxproc_LDFLAGS = @AGENT_LDFLAGS@
 
-KERNEL_MAXPROC_CFLAGS = $(COMMON_COMPILER_FLAGS)
+kernel_maxproc_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_CPU_SWITCHES_SOURCES = \
-	SYSTEM_CPU_SWITCHES.c \
+system_cpu_switches_SOURCES = \
+	system_cpu_switches.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_CPU_SWITCHES_LDADD = \
+system_cpu_switches_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_CPU_SWITCHES_LDADD += @AGENT_LIBS@
+system_cpu_switches_LDADD += @AGENT_LIBS@
 
-SYSTEM_CPU_SWITCHES_LDFLAGS = @AGENT_LDFLAGS@
+system_cpu_switches_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_CPU_SWITCHES_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_cpu_switches_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-KERNEL_MAXFILES_SOURCES = \
-	KERNEL_COMMON.c \
-	KERNEL_MAXFILES.c \
+kernel_maxfiles_SOURCES = \
+	kernel_common.c \
+	kernel_maxfiles.c \
 	$(COMMON_SRC_FILES)
 
-KERNEL_MAXFILES_LDADD = \
+kernel_maxfiles_LDADD = \
 	$(COMMON_LIB_FILES)
 
-KERNEL_MAXFILES_LDADD += @AGENT_LIBS@
+kernel_maxfiles_LDADD += @AGENT_LIBS@
 
-KERNEL_MAXFILES_LDFLAGS = @AGENT_LDFLAGS@
+kernel_maxfiles_LDFLAGS = @AGENT_LDFLAGS@
 
-KERNEL_MAXFILES_CFLAGS = $(COMMON_COMPILER_FLAGS)
+kernel_maxfiles_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_CPU_INTR_SOURCES = \
-	SYSTEM_CPU_INTR.c \
+system_cpu_intr_SOURCES = \
+	system_cpu_intr.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_CPU_INTR_LDADD = \
+system_cpu_intr_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_CPU_INTR_LDADD += @AGENT_LIBS@
+system_cpu_intr_LDADD += @AGENT_LIBS@
 
-SYSTEM_CPU_INTR_LDFLAGS = @AGENT_LDFLAGS@
+system_cpu_intr_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_CPU_INTR_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_cpu_intr_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-SYSTEM_BOOTTIME_SOURCES = \
-	SYSTEM_BOOTTIME.c \
+system_boottime_SOURCES = \
+	system_boottime.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_BOOTTIME_LDADD = \
+system_boottime_LDADD = \
 	$(COMMON_LIB_FILES)
 
-SYSTEM_BOOTTIME_LDADD += @AGENT_LIBS@
+system_boottime_LDADD += @AGENT_LIBS@
 
-SYSTEM_BOOTTIME_LDFLAGS = @AGENT_LDFLAGS@
+system_boottime_LDFLAGS = @AGENT_LDFLAGS@
 
-SYSTEM_BOOTTIME_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_boottime_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_TOTAL
-NET_IF_TOTAL_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_TOTAL.c \
+#net_if_total
+net_if_total_SOURCES = \
+	net_if_common.c \
+	net_if_total.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_TOTAL_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_total_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_TOTAL_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_total_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_IN
-NET_IF_IN_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_IN.c \
+#net_if_in
+net_if_in_SOURCES = \
+	net_if_common.c \
+	net_if_in.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_IN_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_in_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_IN_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_in_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#NET_IF_OUT
-NET_IF_OUT_SOURCES = \
-	NET_IF_COMMON.c \
-	NET_IF_OUT.c \
+#net_if_out
+net_if_out_SOURCES = \
+	net_if_common.c \
+	net_if_out.c \
 	$(COMMON_SRC_FILES)
 
-NET_IF_OUT_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+net_if_out_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-NET_IF_OUT_CFLAGS = $(COMMON_COMPILER_FLAGS)
+net_if_out_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
-#SYSTEM_HW_CHASSIS
-SYSTEM_HW_CHASSIS_SOURCES = \
-	SYSTEM_HW_CHASSIS.c \
+#system_hw_chassis
+system_hw_chassis_SOURCES = \
+	system_hw_chassis.c \
 	$(COMMON_SRC_FILES)
 
-SYSTEM_HW_CHASSIS_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
+system_hw_chassis_LDADD = $(COMMON_LIB_FILES) @AGENT_LIBS@
 
-SYSTEM_HW_CHASSIS_CFLAGS = $(COMMON_COMPILER_FLAGS)
+system_hw_chassis_CFLAGS = $(COMMON_COMPILER_FLAGS)
 
 endif
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c b/tests/libs/zbxsysinfo/linux/kernel_common.c
index e1f75cacd16..1f174abad3d 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_common.c
@@ -17,14 +17,15 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "zbxnum.h"
 
-void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func)
+void	zbx_mock_test_entry_kernel_common(void **state, int kernel_func)
 {
 	AGENT_REQUEST		request;
 	AGENT_RESULT		param_result;
@@ -67,9 +68,9 @@ void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func)
 	zbx_init_agent_result(&param_result);
 
 	if (ZABBIX_MOCK_KERNEL_MAXPROC == kernel_func)
-		actual_result = KERNEL_MAXPROC(&request, &param_result);
+		actual_result = kernel_maxproc(&request, &param_result);
 	else if (ZABBIX_MOCK_KERNEL_MAXFILES == kernel_func)
-		actual_result = KERNEL_MAXFILES(&request, &param_result);
+		actual_result = kernel_maxfiles(&request, &param_result);
 	else
 		fail_msg("Invalid kernel_func");
 
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h b/tests/libs/zbxsysinfo/linux/kernel_common.h
index f84a843f13c..8dca45ef591 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/kernel_common.h
@@ -23,5 +23,5 @@
 #define ZABBIX_MOCK_KERNEL_MAXPROC	0
 #define ZABBIX_MOCK_KERNEL_MAXFILES	1
 
-void	zbx_mock_test_entry_KERNEL_COMMON(void **state, int kernel_func);
+void	zbx_mock_test_entry_kernel_common(void **state, int kernel_func);
 #endif
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.c
index 16649268eab..3656e2c6dd6 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXFILES);
+	zbx_mock_test_entry_kernel_common(state, ZABBIX_MOCK_KERNEL_MAXFILES);
 }
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.yaml b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.yaml
index b0d6628c6eb..b0d6628c6eb 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXFILES.yaml
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxfiles.yaml
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c b/tests/libs/zbxsysinfo/linux/kernel_maxproc.c
index eb99ce00492..45befd25946 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.c
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxproc.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "KERNEL_COMMON.h"
+#include "kernel_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_KERNEL_COMMON(state, ZABBIX_MOCK_KERNEL_MAXPROC);
+	zbx_mock_test_entry_kernel_common(state, ZABBIX_MOCK_KERNEL_MAXPROC);
 }
diff --git a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml b/tests/libs/zbxsysinfo/linux/kernel_maxproc.yaml
index c1209712752..c1209712752 100644
--- a/tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml
+++ b/tests/libs/zbxsysinfo/linux/kernel_maxproc.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c b/tests/libs/zbxsysinfo/linux/net_if_common.c
index 4c4570d8612..42a57778876 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_common.c
@@ -17,14 +17,15 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "zbxnum.h"
 
-void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func)
+void	zbx_mock_test_entry_net_if_common(void **state, int net_if_func)
 {
 	AGENT_REQUEST		request;
 	AGENT_RESULT 		param_result;
@@ -82,11 +83,11 @@ void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func)
 		fail_msg("Cannot parse item key: %s", init_param);
 
 	if (ZABBIX_MOCK_NET_IF_IN == net_if_func)
-		actual_result = NET_IF_IN(&request, &param_result);
+		actual_result = net_if_in(&request, &param_result);
 	else if (ZABBIX_MOCK_NET_IF_OUT == net_if_func)
-		actual_result = NET_IF_OUT(&request, &param_result);
+		actual_result = net_if_out(&request, &param_result);
 	else if (ZABBIX_MOCK_NET_IF_TOTAL == net_if_func)
-		actual_result = NET_IF_TOTAL(&request, &param_result);
+		actual_result = net_if_total(&request, &param_result);
 	else
 		fail_msg("invalid net_if_func");
 
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h b/tests/libs/zbxsysinfo/linux/net_if_common.h
index ba3856fb52c..76c7677cd9f 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_COMMON.h
+++ b/tests/libs/zbxsysinfo/linux/net_if_common.h
@@ -24,5 +24,5 @@
 #define ZABBIX_MOCK_NET_IF_OUT		1
 #define ZABBIX_MOCK_NET_IF_TOTAL	2
 
-void	zbx_mock_test_entry_NET_IF_COMMON(void **state, int net_if_func);
+void	zbx_mock_test_entry_net_if_common(void **state, int net_if_func);
 #endif
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/net_if_discovery.c
index fa728d13c39..63df5a96093 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_discovery.c
@@ -20,8 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "zbxcommon.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 
 #define FAIL_PARAM(NAME, MOCK_ERR)	fail_msg("Cannot get \"%s\": %s", NAME, zbx_mock_error_string(MOCK_ERR))
 
@@ -63,13 +63,13 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key("net.if.discovery", &request))
 		fail_msg("Unexpected return code from zbx_parse_item_key()");
 
-	actual_ret = NET_IF_DISCOVERY(&request, &result);
+	actual_ret = net_if_discovery(&request, &result);
 
 	zbx_free_agent_request(&request);
 
 	if (actual_ret != expected_ret)
 	{
-		fail_msg("Unexpected return code from NET_IF_DISCOVERY(): expected %s, got %s",
+		fail_msg("Unexpected return code from net_if_discovery(): expected %s, got %s",
 				zbx_sysinfo_ret_string(expected_ret), zbx_sysinfo_ret_string(actual_ret));
 	}
 
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml b/tests/libs/zbxsysinfo/linux/net_if_discovery.yaml
index 75493fdaa9d..75493fdaa9d 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_discovery.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c b/tests/libs/zbxsysinfo/linux/net_if_in.c
index d16c2714599..b1d1f7a5cf8 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_IN.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_in.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_IN);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_NET_IF_IN);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_IN.yaml b/tests/libs/zbxsysinfo/linux/net_if_in.yaml
index 564da0c2b1e..564da0c2b1e 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_IN.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_in.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c b/tests/libs/zbxsysinfo/linux/net_if_out.c
index 99e3f99c71d..77fd950c18b 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_out.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_OUT);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_NET_IF_OUT);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.yaml b/tests/libs/zbxsysinfo/linux/net_if_out.yaml
index a1424763ced..a1424763ced 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_OUT.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_out.yaml
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c b/tests/libs/zbxsysinfo/linux/net_if_total.c
index fe153997d6b..6b03da0ec25 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.c
+++ b/tests/libs/zbxsysinfo/linux/net_if_total.c
@@ -17,10 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "NET_IF_COMMON.h"
+#include "net_if_common.h"
 #include "zbxmocktest.h"
 
 void	zbx_mock_test_entry(void **state)
 {
-	zbx_mock_test_entry_NET_IF_COMMON(state, ZABBIX_MOCK_NET_IF_TOTAL);
+	zbx_mock_test_entry_net_if_common(state, ZABBIX_MOCK_NET_IF_TOTAL);
 }
diff --git a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.yaml b/tests/libs/zbxsysinfo/linux/net_if_total.yaml
index 327b827fa2b..327b827fa2b 100644
--- a/tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.yaml
+++ b/tests/libs/zbxsysinfo/linux/net_if_total.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c b/tests/libs/zbxsysinfo/linux/system_boottime.c
index f46d14ec260..2aa04b6cc2c 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.c
+++ b/tests/libs/zbxsysinfo/linux/system_boottime.c
@@ -20,8 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "zbxcommon.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 
 void	zbx_mock_test_entry(void **state)
 {
@@ -58,11 +58,11 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key("system.boottime", &request))
 		fail_msg("Parsing of \"system.boottime\" key failed.");
 
-	switch (ret = SYSTEM_BOOTTIME(&request, &result))
+	switch (ret = system_boottime(&request, &result))
 	{
 		case SYSINFO_RET_OK:
 			if (NULL == expected_result)
-				fail_msg("SYSTEM_BOOTTIME() was not expected to succeed.");
+				fail_msg("system_boottime() was not expected to succeed.");
 			if (NULL == (actual_result = ZBX_GET_TEXT_RESULT(&result)))
 				fail_msg("Result is not set.");
 			if (0 != strcmp(*actual_result, expected_result))
@@ -70,14 +70,14 @@ void	zbx_mock_test_entry(void **state)
 			break;
 		case SYSINFO_RET_FAIL:
 			if (NULL == expected_error)
-				fail_msg("SYSTEM_BOOTTIME() was not expected to fail.");
+				fail_msg("system_boottime() was not expected to fail.");
 			if (NULL == (actual_error = ZBX_GET_MSG_RESULT(&result)))
 				fail_msg("Error message is not set.");
 			if (0 != strcmp(*actual_error, expected_error))
 				fail_msg("Expected error \"%s\" instead of \"%s\".", expected_error, *actual_error);
 			break;
 		default:
-			fail_msg("Unexpected return of SYSTEM_BOOTTIME(): %d (%s).", ret, zbx_sysinfo_ret_string(ret));
+			fail_msg("Unexpected return of system_boottime(): %d (%s).", ret, zbx_sysinfo_ret_string(ret));
 	}
 
 	zbx_free_agent_request(&request);
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml b/tests/libs/zbxsysinfo/linux/system_boottime.yaml
index 0d6747e45fc..4e9669d7777 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_BOOTTIME.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_boottime.yaml
@@ -1,6 +1,6 @@
-# This are test cases for SYSTEM_BOOTTIME() function responsible for "system.boottime" item checks on Linux OS.
-# Section "out" must contain either "result" with expected result of successful SYSTEM_BOOTTIME() execution or "error"
-# with expected error message when SYSTEM_BOOTTIME() should fail. Since check is based on reading /proc/stat file in
+# This are test cases for system_boottime() function responsible for "system.boottime" item checks on Linux OS.
+# Section "out" must contain either "result" with expected result of successful system_boottime() execution or "error"
+# with expected error message when system_boottime() should fail. Since check is based on reading /proc/stat file in
 # search for "btime", section "files" should typically contain "/proc/stat" with some contents to be parsed.
 ---
 test case: no /proc/stat file
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c b/tests/libs/zbxsysinfo/linux/system_cpu_intr.c
index 1672a2beb9b..ab4b757c7b0 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.c
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_intr.c
@@ -3,9 +3,9 @@
 #include "zbxmockhelper.h"
 #include "zbxmockutil.h"
 
-#include "zbxcommon.h"
 #include "module.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 
 static int	read_yaml_ret(void)
 {
@@ -43,7 +43,7 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key(itemkey, &request))
 		fail_msg("Invalid item key format '%s'", itemkey);
 
-	if (read_yaml_ret() != (ret = SYSTEM_CPU_INTR(&request, &result)))
+	if (read_yaml_ret() != (ret = system_cpu_intr(&request, &result)))
 		fail_msg("unexpected return code '%s'", zbx_sysinfo_ret_string(ret));
 
 	if (SYSINFO_RET_OK == ret)
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml b/tests/libs/zbxsysinfo/linux/system_cpu_intr.yaml
index 05925c16cb5..05925c16cb5 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_INTR.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_intr.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c b/tests/libs/zbxsysinfo/linux/system_cpu_switches.c
index f3ab4f79795..a4baf68f3b8 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.c
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_switches.c
@@ -21,6 +21,7 @@
 #include "zbxmockdata.h"
 
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "zbxnum.h"
 
 void	zbx_mock_test_entry(void **state)
@@ -41,7 +42,7 @@ void	zbx_mock_test_entry(void **state)
 	ZBX_UNUSED(state);
 
 	/* set up test case values from an external source */
-	/* SYSTEM_CPU_SWITCHES() does not use AGENT_REQUEST argument, only output parameters have to be set up */
+	/* system_cpu_switches() does not use AGENT_REQUEST argument, only output parameters have to be set up */
 
 	if (ZBX_MOCK_SUCCESS != (mock_ret_code = zbx_mock_out_parameter("expected_ret", &mock_handle)) ||
 			ZBX_MOCK_SUCCESS != (mock_ret_code = zbx_mock_string(mock_handle, &expected_ret_str)))
@@ -84,13 +85,13 @@ void	zbx_mock_test_entry(void **state)
 	zbx_init_agent_result(&zbx_agent_result);
 
 	/* call the function-under-test */
-	actual_ret = SYSTEM_CPU_SWITCHES(&zbx_agent_request, &zbx_agent_result);
+	actual_ret = system_cpu_switches(&zbx_agent_request, &zbx_agent_result);
 
 	/* check test results */
 
 	if (expected_ret != actual_ret)
 	{
-		fail_msg("Unexpected return code from SYSTEM_CPU_SWITCHES(): expected %s, got %s",
+		fail_msg("Unexpected return code from system_cpu_switches(): expected %s, got %s",
 				zbx_sysinfo_ret_string(expected_ret), zbx_sysinfo_ret_string(actual_ret));
 	}
 
@@ -99,11 +100,11 @@ void	zbx_mock_test_entry(void **state)
 		zbx_uint64_t	*actual_context_switches_count;
 
 		if (NULL == (actual_context_switches_count = ZBX_GET_UI64_RESULT(&zbx_agent_result)))
-			fail_msg("SYSTEM_CPU_SWITCHES() returned no valid number of context switches in AGENT_RESULT.");
+			fail_msg("system_cpu_switches() returned no valid number of context switches in AGENT_RESULT.");
 
 		if (expected_context_switches_count != *actual_context_switches_count)
 		{
-			fail_msg("SYSTEM_CPU_SWITCHES() context switches: expected " ZBX_FS_UI64 ", got " ZBX_FS_UI64
+			fail_msg("system_cpu_switches() context switches: expected " ZBX_FS_UI64 ", got " ZBX_FS_UI64
 					".", expected_context_switches_count, *actual_context_switches_count);
 		}
 	}
@@ -112,11 +113,11 @@ void	zbx_mock_test_entry(void **state)
 		char	**actual_error_msg;
 
 		if (NULL == (actual_error_msg = ZBX_GET_MSG_RESULT(&zbx_agent_result)) || NULL == *actual_error_msg)
-			fail_msg("SYSTEM_CPU_SWITCHES() returned no valid error message in AGENT_RESULT.");
+			fail_msg("system_cpu_switches() returned no valid error message in AGENT_RESULT.");
 
 		if (0 != strcmp(expected_error_msg, *actual_error_msg))
 		{
-			fail_msg("SYSTEM_CPU_SWITCHES() error message: expected \"%s\", got \"%s\"",
+			fail_msg("system_cpu_switches() error message: expected \"%s\", got \"%s\"",
 					expected_error_msg, *actual_error_msg);
 		}
 	}
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml b/tests/libs/zbxsysinfo/linux/system_cpu_switches.yaml
index e486911909e..e486911909e 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_cpu_switches.yaml
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c b/tests/libs/zbxsysinfo/linux/system_hw_chassis.c
index a394c8e61e0..6b01bb35068 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.c
+++ b/tests/libs/zbxsysinfo/linux/system_hw_chassis.c
@@ -22,8 +22,8 @@
 #include "zbxmockutil.h"
 #include "zbxmockhelper.h"
 
-#include "zbxcommon.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 
 void	zbx_mock_test_entry(void **state)
 {
@@ -44,9 +44,9 @@ void	zbx_mock_test_entry(void **state)
 	if (SUCCEED != zbx_parse_item_key(param, &request))
 		fail_msg("Cannot parse item key: %s", param);
 
-	if (expected_result != (actual_result = SYSTEM_HW_CHASSIS(&request, &result)))
+	if (expected_result != (actual_result = system_hw_chassis(&request, &result)))
 	{
-		fail_msg("Unexpected return code from SYSTEM_HW_CHASSIS(): expected %s, got %s",
+		fail_msg("Unexpected return code from system_hw_chassis(): expected %s, got %s",
 				zbx_sysinfo_ret_string(expected_result), zbx_sysinfo_ret_string(actual_result));
 	}
 
diff --git a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.yaml b/tests/libs/zbxsysinfo/linux/system_hw_chassis.yaml
index 9ca6b795fcd..9ca6b795fcd 100644
--- a/tests/libs/zbxsysinfo/linux/SYSTEM_HW_CHASSIS.yaml
+++ b/tests/libs/zbxsysinfo/linux/system_hw_chassis.yaml
diff --git a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.c
index 571d521b4d6..48a5cd4e8aa 100644
--- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.c
+++ b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.c
@@ -20,8 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockdata.h"
 
-#include "zbxcommon.h"
 #include "zbxsysinfo.h"
+#include "../../../../src/libs/zbxsysinfo/sysinfo.h"
 
 #define GET_TEST_PARAM_FAIL(NAME, MOCK_ERR)	fail_msg("Cannot get \"%s\": %s", NAME, zbx_mock_error_string(MOCK_ERR))
 
@@ -71,9 +71,9 @@ void	zbx_mock_test_entry(void **state)
 	zbx_init_agent_request(&request);
 	zbx_init_agent_result(&result);
 
-	if (expected_result != (actual_result = VFS_FS_DISCOVERY(&request, &result)))
+	if (expected_result != (actual_result = vfs_fs_discovery(&request, &result)))
 	{
-		fail_msg("Unexpected return code from VFS_FS_DISCOVERY(): expected %s, got %s",
+		fail_msg("Unexpected return code from vfs_fs_discovery(): expected %s, got %s",
 				zbx_sysinfo_ret_string(expected_result), zbx_sysinfo_ret_string(actual_result));
 	}
 
diff --git a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.yaml
index 0d4d9c88de5..0d4d9c88de5 100644
--- a/tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml
+++ b/tests/libs/zbxsysinfo/linux/vfs_fs_discovery.yaml
diff --git a/tests/libs/zbxsysinfo/zbx_execute_agent_check.c b/tests/libs/zbxsysinfo/zbx_execute_agent_check.c
index bf48e3841f4..ffa097313f2 100644
--- a/tests/libs/zbxsysinfo/zbx_execute_agent_check.c
+++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check.c
@@ -29,20 +29,20 @@
 
 static char	*called_key = NULL;
 
-int	__wrap_SYSTEM_LOCALTIME(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_SIZE(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_TIME(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_EXISTS(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_CONTENTS(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_REGEXP(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_REGMATCH(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_MD5SUM(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_FILE_CKSUM(const char *command, AGENT_RESULT *result);
-int	__wrap_VFS_DIR_SIZE(const char *command, AGENT_RESULT *result);
-int	__wrap_NET_DNS(const char *command, AGENT_RESULT *result);
-int	__wrap_NET_DNS_RECORD(const char *command, AGENT_RESULT *result);
-int	__wrap_NET_TCP_PORT(const char *command, AGENT_RESULT *result);
-int	__wrap_SYSTEM_USERS_NUM(const char *command, AGENT_RESULT *result);
+int	__wrap_system_localtime(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_size(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_time(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_exists(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_contents(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_regexp(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_regmatch(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_md5sum(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_file_cksum(const char *command, AGENT_RESULT *result);
+int	__wrap_vfs_dir_size(const char *command, AGENT_RESULT *result);
+int	__wrap_net_dns(const char *command, AGENT_RESULT *result);
+int	__wrap_net_dns_record(const char *command, AGENT_RESULT *result);
+int	__wrap_net_tcp_port(const char *command, AGENT_RESULT *result);
+int	__wrap_system_users_num(const char *command, AGENT_RESULT *result);
 
 void	zbx_mock_test_entry(void **state)
 {
@@ -83,7 +83,7 @@ void	zbx_mock_test_entry(void **state)
 	}
 }
 
-int	__wrap_SYSTEM_LOCALTIME(const char *command, AGENT_RESULT *result)
+int	__wrap_system_localtime(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -93,7 +93,7 @@ int	__wrap_SYSTEM_LOCALTIME(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_SIZE(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_size(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -103,7 +103,7 @@ int	__wrap_VFS_FILE_SIZE(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_TIME(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_time(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -113,7 +113,7 @@ int	__wrap_VFS_FILE_TIME(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_EXISTS(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_exists(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -123,7 +123,7 @@ int	__wrap_VFS_FILE_EXISTS(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_CONTENTS(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_contents(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -133,7 +133,7 @@ int	__wrap_VFS_FILE_CONTENTS(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_REGEXP(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_regexp(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -143,7 +143,7 @@ int	__wrap_VFS_FILE_REGEXP(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_REGMATCH(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_regmatch(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -153,7 +153,7 @@ int	__wrap_VFS_FILE_REGMATCH(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_MD5SUM(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_md5sum(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -163,7 +163,7 @@ int	__wrap_VFS_FILE_MD5SUM(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_FILE_CKSUM(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_file_cksum(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -173,7 +173,7 @@ int	__wrap_VFS_FILE_CKSUM(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_VFS_DIR_SIZE(const char *command, AGENT_RESULT *result)
+int	__wrap_vfs_dir_size(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -183,7 +183,7 @@ int	__wrap_VFS_DIR_SIZE(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_NET_DNS(const char *command, AGENT_RESULT *result)
+int	__wrap_net_dns(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -193,7 +193,7 @@ int	__wrap_NET_DNS(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_NET_DNS_RECORD(const char *command, AGENT_RESULT *result)
+int	__wrap_net_dns_record(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -203,7 +203,7 @@ int	__wrap_NET_DNS_RECORD(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_NET_TCP_PORT(const char *command, AGENT_RESULT *result)
+int	__wrap_net_tcp_port(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -213,7 +213,7 @@ int	__wrap_NET_TCP_PORT(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_SYSTEM_USERS_NUM(const char *command, AGENT_RESULT *result)
+int	__wrap_system_users_num(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
diff --git a/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml b/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml
index 49655beebed..69a7b377d15 100644
--- a/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml
+++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check.yaml
@@ -1,71 +1,71 @@
 ---
-test case: successfully called SYSTEM_LOCALTIME function
+test case: successfully called system_localtime function
 in:
   in_command: system.localtime[utc]
   flags: 4
 ---
-test case: successfully called VFS_FILE_SIZE function
+test case: successfully called vfs_file_size function
 in:
   in_command: vfs.file.size[/etc/passwd]
   flags: 4
 ---
-test case: successfully called VFS_FILE_TIME function
+test case: successfully called vfs_file_time function
 in:
   in_command: vfs.file.time[/etc/passwd,modify]
   flags: 4
 ---
-test case: successfully called VFS_FILE_EXISTS function
+test case: successfully called vfs_file_exists function
 in:
   in_command: vfs.file.exists[/etc/passwd]
   flags: 4
 ---
-test case: successfully called VFS_FILE_CONTENTS function
+test case: successfully called vfs_file_contents function
 in:
   in_command: vfs.file.contents[/etc/passwd]
   flags: 4
 ---
 # This case doesn't work
-#test case: successfully called VFS_FILE_REGEXP function
+#test case: successfully called vfs_file_regexp function
 #in:
 #  in_command: vfs.file.regexp[/etc/passwd,root]
 #  flags: 4
 #---
-test case: successfully called VFS_FILE_REGMATCH function
+test case: successfully called vfs_file_regmatch function
 in:
   in_command: vfs.file.regmatch[/etc/passwd,root]
   flags: 4
 ---
-test case: successfully called VFS_FILE_MD5SUM function
+test case: successfully called vfs_file_md5sum function
 in:
   in_command: vfs.file.md5sum[/etc/passwd]
   flags: 4
 ---
-test case: successfully called VFS_FILE_CKSUM function
+test case: successfully called vfs_file_cksum function
 in:
   in_command: vfs.file.cksum[/etc/passwd]
   flags: 4
 ---
-test case: successfully called VFS_DIR_SIZE function
+test case: successfully called vfs_dir_size function
 in:
   in_command: vfs.dir.size[/var/log]
   flags: 4
 ---
-test case: successfully called NET_DNS function
+test case: successfully called net_dns function
 in:
   in_command: net.dns[,zabbix.com]
   flags: 4
 ---
-test case: successfully called NET_DNS_RECORD function
+test case: successfully called net_dns_record function
 in:
   in_command: net.dns.record[,zabbix.com]
   flags: 4
 ---
-test case: successfully called NET_TCP_PORT function
+test case: successfully called net_tcp_port function
 in:
   in_command: net.tcp.port[,80]
   flags: 4
 ---
-test case: successfully called SYSTEM_USERS_NUM function
+test case: successfully called system_users_num function
 in:
   in_command: system.users.num
   flags: 4
diff --git a/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c
index 532e797f911..e22b31bcf68 100644
--- a/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c
+++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.c
@@ -22,14 +22,15 @@
 
 #include "zbxdbhigh.h"
 #include "zbxsysinfo.h"
+#include "../../../src/libs/zbxsysinfo/sysinfo.h"
 #include "zbxnum.h"
 #include "zbxstr.h"
 
 static char	*called_key = NULL;
 
-int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result);
-int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result);
-int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result);
+int	__wrap_web_page_get(const char *command, AGENT_RESULT *result);
+int	__wrap_web_page_perf(const char *command, AGENT_RESULT *result);
+int	__wrap_web_page_regexp(const char *command, AGENT_RESULT *result);
 
 void	zbx_mock_test_entry(void **state)
 {
@@ -70,7 +71,7 @@ void	zbx_mock_test_entry(void **state)
 	}
 }
 
-int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result)
+int	__wrap_web_page_get(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -80,7 +81,7 @@ int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result)
+int	__wrap_web_page_perf(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
@@ -90,7 +91,7 @@ int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result)
+int	__wrap_web_page_regexp(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
 	ZBX_UNUSED(result);
diff --git a/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml
index b2fd1b62caf..e2230dfccd9 100644
--- a/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml
+++ b/tests/libs/zbxsysinfo/zbx_execute_agent_check_http.yaml
@@ -1,15 +1,15 @@
 ---
-test case: successfully called WEB_PAGE_GET function
+test case: successfully called web_page_get function
 in:
   in_command: web.page.get[localhost,,80]
   flags: 4
 ---
-test case: successfully called WEB_PAGE_PERF function
+test case: successfully called web_page_perf function
 in:
   in_command: web.page.perf[localhost,,80]
   flags: 4
 ---
-test case: successfully called WEB_PAGE_REGEXP function
+test case: successfully called web_page_regexp function
 in:
   in_command: web.page.regexp[localhost,,80,OK]
   flags: 4