diff --git a/arch/x86_64/include/kernel_arch_func.h b/arch/x86_64/include/kernel_arch_func.h
index 8293627c89e..4b21e8b24dc 100644
--- a/arch/x86_64/include/kernel_arch_func.h
+++ b/arch/x86_64/include/kernel_arch_func.h
@@ -51,7 +51,7 @@ static inline bool z_arch_irq_unlocked(unsigned int key)
 	return (key & 0x200) != 0;
 }
 
-static inline void arch_nop(void)
+static inline void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h
index a5ace88be4e..fd7755c7ed5 100644
--- a/include/arch/arc/arch.h
+++ b/include/arch/arc/arch.h
@@ -229,7 +229,7 @@ typedef u32_t k_mem_partition_attr_t;
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/arm/misc.h b/include/arch/arm/misc.h
index 82cedab39bb..6bccf2e1765 100644
--- a/include/arch/arm/misc.h
+++ b/include/arch/arm/misc.h
@@ -27,7 +27,7 @@ extern u32_t z_timer_cycle_get_32(void);
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index b59feba5a25..7633592a861 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -204,7 +204,7 @@ extern u32_t z_timer_cycle_get_32(void);
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/posix/arch.h b/include/arch/posix/arch.h
index 71883203e30..56c1e0809f4 100644
--- a/include/arch/posix/arch.h
+++ b/include/arch/posix/arch.h
@@ -45,7 +45,7 @@ extern u32_t z_timer_cycle_get_32(void);
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/riscv/arch.h b/include/arch/riscv/arch.h
index 8d0b15c1bd4..a1ee4fc06e1 100644
--- a/include/arch/riscv/arch.h
+++ b/include/arch/riscv/arch.h
@@ -149,7 +149,7 @@ static ALWAYS_INLINE bool z_arch_irq_unlocked(unsigned int key)
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index e43ceca1f04..d125bc5bf8a 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -266,7 +266,7 @@ static inline u64_t z_tsc_read(void)
 	return rv.value;
 }
 
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
index d6294c0cb32..7ee5d2901c2 100644
--- a/include/arch/xtensa/arch.h
+++ b/include/arch/xtensa/arch.h
@@ -86,7 +86,7 @@ extern u32_t z_timer_cycle_get_32(void);
 /**
  * @brief Explicitly nop operation.
  */
-static ALWAYS_INLINE void arch_nop(void)
+static ALWAYS_INLINE void z_arch_nop(void)
 {
 	__asm__ volatile("nop");
 }
diff --git a/kernel/init.c b/kernel/init.c
index bfbebea3d61..2a2339eceed 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -302,7 +302,7 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3)
 void __weak main(void)
 {
 	/* NOP default main() if the application does not provide one. */
-	arch_nop();
+	z_arch_nop();
 }
 
 /* LCOV_EXCL_STOP */