diff --git a/include/kernel_version.h b/include/kernel_version.h
index f30d99d09fa..2f5f1802985 100644
--- a/include/kernel_version.h
+++ b/include/kernel_version.h
@@ -51,16 +51,16 @@
  *
  * Part 3: The least significant byte is reserved for future use.
  */
-#define KERNEL_VER_GENERATION(ver) ((ver >> 28) & 0x0F)
-#define KERNEL_VER_MAJOR(ver) ((ver >> 24) & 0x0F)
-#define KERNEL_VER_MINOR(ver) ((ver >> 20) & 0x0F)
-#define KERNEL_VER_SERVICEPACK(ver) ((ver >> 16) & 0x0F)
+#define SYS_KERNEL_VER_GENERATION(ver) ((ver >> 28) & 0x0F)
+#define SYS_KERNEL_VER_MAJOR(ver) ((ver >> 24) & 0x0F)
+#define SYS_KERNEL_VER_MINOR(ver) ((ver >> 20) & 0x0F)
+#define SYS_KERNEL_VER_SERVICEPACK(ver) ((ver >> 16) & 0x0F)
 
 /* return 8-bit flags */
-#define KERNEL_VER_FLAGS(ver) ((ver >> 8) & 0xFF)
+#define SYS_KERNEL_VER_FLAGS(ver) ((ver >> 8) & 0xFF)
 
 /* kernel version routines */
 
-extern uint32_t kernel_version_get(void);
+extern uint32_t sys_kernel_version_get(void);
 
 #endif /* _kernel_version__h_ */
diff --git a/kernel/nanokernel/version.c b/kernel/nanokernel/version.c
index fdadcce4a0e..92b5ba6612e 100644
--- a/kernel/nanokernel/version.c
+++ b/kernel/nanokernel/version.c
@@ -41,7 +41,7 @@ static uint32_t kernel_version = KERNELVERSION;
 
 /*******************************************************************************
 *
-* kernel_version_get - return the kernel version of the present build
+* sys_kernel_version_get - return the kernel version of the present build
 *
 * The kernel version is a four-byte value, whose format is decribed in the
 * file "kernel_version.h".
@@ -49,7 +49,7 @@ static uint32_t kernel_version = KERNELVERSION;
 * RETURNS: kernel version
 */
 
-uint32_t kernel_version_get(void)
+uint32_t sys_kernel_version_get(void)
 {
 	return kernel_version;
 }
diff --git a/samples/nanokernel/benchmark/sys_kernel/src/syskernel.c b/samples/nanokernel/benchmark/sys_kernel/src/syskernel.c
index d401f81cc52..b89b31710a1 100644
--- a/samples/nanokernel/benchmark/sys_kernel/src/syskernel.c
+++ b/samples/nanokernel/benchmark/sys_kernel/src/syskernel.c
@@ -211,7 +211,7 @@ void main(void)
 
 	do {
 		fprintf(output_file, sz_module_title_fmt, "Nanokernel API test");
-		fprintf(output_file, sz_kernel_ver_fmt, kernel_version_get());
+		fprintf(output_file, sz_kernel_ver_fmt, sys_kernel_version_get());
 		fprintf(output_file,
 				"\n\nEach test below are repeated %d times and the average\n"
 				"time for one iteration is displayed.", NUMBER_OF_LOOPS);